From f92f5597f67defb00795387079bdc938f1a49801 Mon Sep 17 00:00:00 2001
From: Goetz Gaycken <goetz.gaycken@cern.ch>
Date: Tue, 11 Apr 2017 15:44:51 +0200
Subject: [PATCH] Replace deprecated methods to query blayer hit information.
Several methods to query blayer hit information are replaced by methods
to qurey innermost hit information. This addresses the first step
towards the resolution of ATLASRECTS-3124.
---
Event/PyDumper/python/Dumpers.py | 4 +--
.../xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h | 6 ++--
.../share/InDetRecNtupleCreation.py | 4 +--
.../src/TrackSelectionAlg.cxx | 2 +-
.../InDetDiMuonMonitoring/src/DiMuMon.cxx | 4 +--
.../src/IDPerfMonEoverP.cxx | 4 +--
.../src/MuonSelector.cxx | 4 +--
.../src/TRT_Electron_Monitoring_Tool.cxx | 2 +-
.../src/SingleTrackConversionTool.cxx | 10 +++---
.../src/PVFindingTrackFilter_cxx | 4 +--
.../src/InDetTestBLayerTool.cxx | 4 +--
.../src/InDetTestPixelLayerTool.cxx | 6 ++--
.../src/InDetAmbiScoringTool.cxx | 6 ++--
.../src/InDetDetailedTrackSelectorTool.cxx | 8 ++---
.../src/InDetTrackSelectorTool.cxx | 6 ++--
.../src/InDetTrackSummaryHelperTool.cxx | 34 +++++++++----------
.../src/InDetVKalPriVxFinder.cxx | 8 ++---
.../src/Utilities.cxx | 4 +--
.../InDetVKalVxInJetTool/src/CutTrk.cxx | 8 ++---
.../InDetVKalVxInJetTool/src/Utilities.cxx | 2 +-
.../src/IDStandardPerformance.cxx | 2 +-
.../src/InDetPerfPlot_ExtendedFakes.cxx | 8 ++---
.../src/InDetPerfPlot_HitDetailed.cxx | 8 ++---
.../src/InDetPerfPlot_TrkInJet.cxx | 8 ++---
.../src/TrackSelectionTool.cxx | 8 ++---
.../src/TrackStatHelper.cxx | 6 ++--
.../src/MuonTrackScoringTool.cxx | 4 +--
.../MuonTrackMonitoring/src/RecoMuonPlots.cxx | 2 +-
.../MuonHistUtils/Root/IDHitSummaryPlots.cxx | 4 +--
.../src/MuonPerformanceAlg.cxx | 6 ++--
.../AnalysisExamples/src/JetTagAna.cxx | 8 ++---
.../AnalysisExamples/src/TrackExample.cxx | 2 +-
.../src/ElectronIDSelectorCore.cxx | 4 +--
.../AnalysisJiveXML/src/ElectronRetriever.cxx | 2 +-
.../src/TrackParticleRetriever.cxx | 2 +-
.../src/D2PDTrackParticleSelector.cxx | 2 +-
.../D3PDMakerConfig/doc/muon-variables | 4 +--
.../python/JetTagTrackD3PDObject.py | 2 +-
.../src/MuonTrkHitFillerTool.cxx | 6 ++--
.../TileD3PDMaker/src/TileMuonFillerTool.cxx | 8 ++---
.../TileD3PDMaker/src/TileTrackFillerTool.cxx | 8 ++---
.../python/xAODTrackSummaryFiller.py | 2 +-
.../src/TrackTrackSummaryFillerTool.cxx | 10 +++---
.../src/egammaConversionFillerTool.cxx | 4 +--
.../python/ElectronsCPContent.py | 2 +-
.../python/InDetTrackParticlesCPContent.py | 2 +-
.../python/InDetTrackParticlesCPContent.py | 2 +-
.../Root/AsgElectronMultiLeptonSelector.cxx | 4 +--
.../src/BasicTrackGradeFactory.cxx | 2 +-
.../src/DetailedTrackGradeFactory.cxx | 6 ++--
.../JetTagging/JetTagTools/src/RNNIPTag.cxx | 10 +++---
.../JetTagTools/src/SharedHitMapper.cxx | 2 +-
.../JetTagTools/src/TrackSelector.cxx | 6 ++--
.../MuonID/MuonTagTools/src/MuonTagTool.cxx | 6 ++--
.../PrimaryDPDMaker/src/ThinContainers.cxx | 4 +--
.../Root/tools/TrackPatternsHolder.cxx | 6 ++--
.../share/PhysDESDM_SmpCaloId.py | 2 +-
.../ZeeValidation/src/ReconElectronsPlots.cxx | 4 +--
.../src/InDetCandidateTool.cxx | 4 +--
.../src/MuonPrintingTool.cxx | 6 ++--
.../muonEvent/muonEvent/Muon.h | 4 +--
.../MuonIdentification/muonEvent/src/Muon.cxx | 8 ++---
.../egammaPerformance/src/ZeeTaPMonTool.cxx | 6 ++--
.../egammaPerformance/src/electronMonTool.cxx | 6 ++--
.../tauRecTools/src/TauConversionTagger.cxx | 8 ++---
.../src/ISF_TrackSummaryHelperTool.cxx | 4 +--
.../TrkJiveXML/src/TrackRetriever.cxx | 2 +-
.../src/TrackScoringTool.cxx | 4 +--
.../src/TrackSummaryTool.cxx | 4 ---
.../TrkValHistUtils/Root/IDHitPlots.cxx | 8 ++---
.../TrigEgammaRec/src/TrigEgammaRec.cxx | 2 +-
.../src/TrigT2HistoPrmVtxBase.cxx | 4 +--
.../Root/TrigEgammaNavNtuple.cxx | 6 ++--
.../Root/TrigEgammaNavTPNtuple.cxx | 6 ++--
.../TrigInDetAnalysisUtils/Converter.h | 6 ++--
.../TrigTrackSelector_old.h | 8 ++---
.../src/OfflineObjectSelection.cxx | 6 ++--
.../src/TrigTrackSelector.cxx | 12 +++----
.../TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx | 8 ++---
.../TrigBjetHypo/src/TrigBjetFex.cxx | 2 +-
.../TrigHIHypo/src/TrigHIEFTrackHypo.cxx | 4 +--
.../src/HLTXAODBphysMonTool.cxx | 4 +--
.../src/HLTXAODBphysMonTool_orig.cpp | 8 ++---
.../AnalysisConfig_Jpsi.h | 4 +--
.../src/AnalysisConfig_Jpsi.cxx | 4 +--
.../TrigJPsiTools/MuonTrackSelector.h | 2 +-
86 files changed, 227 insertions(+), 231 deletions(-)
diff --git a/Event/PyDumper/python/Dumpers.py b/Event/PyDumper/python/Dumpers.py
index 29b8274d134..51f1524e708 100644
--- a/Event/PyDumper/python/Dumpers.py
+++ b/Event/PyDumper/python/Dumpers.py
@@ -581,12 +581,12 @@ def dump_Muon (m, f):
m.fitChi2(), m.fitNumberDoF(), m.fitChi2OverDoF(),
m.bestMatch()),
print >> f, '\n b: %d %d %d %d %d %d %d %d %d %d %d %d' % \
- (m.numberOfBLayerHits(),
+ (m.numberOfInnermostPixelLayerHits(),
m.numberOfPixelHits(),
m.numberOfSCTHits(),
m.numberOfTRTHits(),
m.numberOfTRTHighThresholdHits(),
- m.numberOfBLayerSharedHits(),
+ m.numberOfInnermostPixelLayerSharedHits(),
m.numberOfPixelSharedHits(),
m.numberOfPixelHoles(),
m.numberOfSCTSharedHits(),
diff --git a/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h b/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h
index 142097ad299..8a7443c9158 100644
--- a/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h
+++ b/Event/xAOD/xAODMuon/xAODMuon/versions/Muon_v1.h
@@ -137,9 +137,9 @@ namespace xAOD {
/// then the function fills 'value' and returns 'true', otherwise it returns 'false', and does not touch 'value'.
/// See below for an example of how this is intended to be used.
/// @code
- /// uint8_t numberOfBLayerHits=0;
- /// if( myParticle.summaryValue<uint8_t>(numberOfBLayerHits,numberOfBLayerHits) ){
- /// ATH_MSG_INFO("Successfully retrieved the integer value, numberOfBLayerHits");
+ /// uint8_t numberOfInnermostPixelLayerHits=0;
+ /// if( myParticle.summaryValue<uint8_t>(numberOfInnermostPixelLayerHits,numberOfInnermostPixelLayerHits) ){
+ /// ATH_MSG_INFO("Successfully retrieved the integer value, numberOfInnermostPixelLayerHits");
/// }
/// float numberOfCscPhiHits=0.0; //Wrong! This is actually an int too.
/// if( !myParticle.summaryValue<float>(numberOfCscPhiHits,numberOfCscPhiHits) ){
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py
index 9dfdbd8b897..b3135009493 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py
@@ -87,7 +87,7 @@ if InDetFlags.doNtupleCreation():
maxD0 = 2000.,
maxD0overSigmaD0 = 500.,
numberOfPixelHits = minNumberOfPixelHitsForTracksInNtuple,
- numberOfBLayerHits = 0,
+ numberOfInnermostPixelLayerHits = 0,
TrackSummaryTool = InDetTrackSummaryTool)
#if (InDetFlags.doLowPt()):
# TrkValTrackSelectorTool.minPt = InDetNewTrackingCutsLowPt.minPT()
@@ -99,7 +99,7 @@ if InDetFlags.doNtupleCreation():
TrkValTrackSelectorTool.maxD0 = 9999999.0
TrkValTrackSelectorTool.maxD0overSigmaD0 = 9999999.0
TrkValTrackSelectorTool.numberOfPixelHits = 1
- TrkValTrackSelectorTool.numberOfBLayerHits = 0
+ TrkValTrackSelectorTool.numberOfInnermostPixelLayerHits = 0
ToolSvc += TrkValTrackSelectorTool
if (InDetFlags.doPrintConfigurables()):
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionAlg.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionAlg.cxx
index e4b3abb11f4..ef358d01057 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionAlg.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/TrackSelectionAlg.cxx
@@ -186,7 +186,7 @@ bool TrackSelectionAlg::makeTrackCuts(Trk::Track* track, float zVtx)
else{
nhpix = summary->get(Trk::numberOfPixelHits);
- nhblay = summary->get(Trk::numberOfBLayerHits);
+ nhblay = summary->get(Trk::numberOfInnermostPixelLayerHits);
nhsct = summary->get(Trk::numberOfSCTHits);
nhtrt = summary->get(Trk::numberOfTRTHits);
nhtrtHT = summary->get(Trk::numberOfTRTHighThresholdHits);
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx
index 74e3400ca4b..5e507e3a022 100644
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx
+++ b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx
@@ -666,8 +666,8 @@ bool DiMuMon::trackQuality(const xAOD::TrackParticle *idTrk){
// https://twiki.cern.ch/twiki/bin/view/AtlasProtected/MCPAnalysisGuidelinesEPS2011
if (idTrk) {
uint8_t dummy(-1);
- bool eBLhits = idTrk->summaryValue( dummy, xAOD::expectBLayerHit )? dummy :-1;
- int nBLhits = idTrk->summaryValue( dummy, xAOD::numberOfBLayerHits )? dummy :-1;
+ bool eBLhits = idTrk->summaryValue( dummy, xAOD::expectInnermostPixelLayerHit )? dummy :-1;
+ int nBLhits = idTrk->summaryValue( dummy, xAOD::numberOfInnermostPixelLayerHits )? dummy :-1;
int nhitsPIX = idTrk->summaryValue( dummy, xAOD::numberOfPixelHits )? dummy :-1;
int nPIXDS = idTrk->summaryValue( dummy, xAOD::numberOfPixelDeadSensors )? dummy :-1;
int nhitsSCT = idTrk->summaryValue( dummy, xAOD::numberOfSCTHits )? dummy :-1;
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
index 39f89e52cf9..e9188b04bae 100755
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/IDPerfMonEoverP.cxx
@@ -185,7 +185,7 @@ StatusCode IDPerfMonEoverP::initialize()
m_PID_TrackCaloMatchType_Names.push_back( std::make_pair( xAOD::EgammaParameters::deltaPhi2,"deltaphi2"));//21
// m_PID_TrackCaloMatchType_Names.push_back( std::make_pair( xAOD::EgammaParameters::deltaPhiRescaled,"deltaphiRescaled"));//22
// Following are of summary type
- // m_PID_SummaryType_Names.push_back( std::make_pair(xAOD::expectBLayerHit,"expectHitInBLayer"));//23 // throwing an error for some reason
+ // m_PID_SummaryType_Names.push_back( std::make_pair(xAOD::expectInnermostPixelLayerHit,"expectHitInBLayer"));//23 // throwing an error for some reason
//
@@ -550,7 +550,7 @@ StatusCode IDPerfMonEoverP::execute()
m_nTRT[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfTRTHits )? dummy :-1;
m_nSCT[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfSCTHits )? dummy :-1;
m_nPIX[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfPixelHits )? dummy :-1;
- m_nBLayer[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfBLayerHits)? dummy :-1;
+ m_nBLayer[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfInnermostPixelLayerHits)? dummy :-1;
m_nTRTout[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfTRTOutliers)? dummy :-1;
m_nSCTout[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfSCTOutliers)? dummy :-1;
m_nTRTHT[m_electronCounter] = mytp->summaryValue( dummy , xAOD::numberOfTRTHighThresholdHits)? dummy :-1;
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/MuonSelector.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/MuonSelector.cxx
index 6ce1627c2aa..c27ee1c18aa 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/MuonSelector.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/MuonSelector.cxx
@@ -182,8 +182,8 @@ bool MuonSelector::passQualCuts()
if( xAOD::Muon::Combined ) return false;
if (IDTrk) {
uint8_t dummy(-1);
- bool eBLhits = IDTrk->summaryValue( dummy, xAOD::expectBLayerHit )? dummy :-1;
- int nBLhits = IDTrk->summaryValue( dummy, xAOD::numberOfBLayerHits )? dummy :-1;
+ bool eBLhits = IDTrk->summaryValue( dummy, xAOD::expectInnermostPixelLayerHit )? dummy :-1;
+ int nBLhits = IDTrk->summaryValue( dummy, xAOD::numberOfInnermostPixelLayerHits )? dummy :-1;
int nhitsPIX = IDTrk->summaryValue( dummy, xAOD::numberOfPixelHits )? dummy :-1;
int nhitsSCT = IDTrk->summaryValue( dummy, xAOD::numberOfSCTHits )? dummy :-1;
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/TRT_Electron_Monitoring_Tool.cxx b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/TRT_Electron_Monitoring_Tool.cxx
index cf03900bbae..8071f1a7abb 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/TRT_Electron_Monitoring_Tool.cxx
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/src/TRT_Electron_Monitoring_Tool.cxx
@@ -553,7 +553,7 @@ pionQualityCuts(xAOD::TrackParticle *trkP,std::vector<Trk::Track*> &v_usedTrks)
uint8_t dummy(-1);
int nPix = trkP->summaryValue(dummy,xAOD::numberOfPixelHits)?dummy:-1;
int nSCT = trkP->summaryValue(dummy,xAOD::numberOfSCTHits)?dummy:-1;
- int nBLa = trkP->summaryValue(dummy,xAOD::numberOfBLayerHits)?dummy:-1;
+ int nBLa = trkP->summaryValue(dummy,xAOD::numberOfInnermostPixelLayerHits)?dummy:-1;
int nTRT = trkP->summaryValue(dummy,xAOD::numberOfTRTHits)?dummy:-1;
int nTRTOut = trkP->summaryValue(dummy,xAOD::numberOfTRTOutliers)?dummy:-1;
float dEdX = trkP->summaryValue(dummy,xAOD::pixeldEdx)?dummy:-1;
diff --git a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx
index 0b6b1ecc5f7..01d3c77a789 100644
--- a/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetConversionFinderTools/src/SingleTrackConversionTool.cxx
@@ -311,7 +311,7 @@ namespace InDet {
bool pass = true;
- const bool expectedHitInBLayer = tSum->get(Trk::expectBLayerHit);
+ const bool expectedHitInBLayer = tSum->get(Trk::expectInnermostPixelLayerHit);
if (expectedHitInBLayer) {
// ME: cut on minInitR if blayer is ok
if(trkPar->position().perp() < m_minInitR ) pass = false;
@@ -331,7 +331,7 @@ namespace InDet {
}
// do we reject tracks with blayer ?
- int nBLHits = tSum->get(Trk::numberOfBLayerHits) + tSum->get(Trk::numberOfBLayerOutliers);
+ int nBLHits = tSum->get(Trk::numberOfInnermostPixelLayerHits) + tSum->get(Trk::numberOfInnermostPixelLayerOutliers);
if(nBLHits > m_maxBLhits) pass = false;
delete tSum;
@@ -481,7 +481,7 @@ namespace InDet {
uint8_t dummy;
uint8_t expectedHitInBLayer(0);
- if( track->summaryValue(dummy,xAOD::expectBLayerHit) )
+ if( track->summaryValue(dummy,xAOD::expectInnermostPixelLayerHit) )
expectedHitInBLayer = dummy;
float Rfirst = trk_meas.position().perp();
@@ -539,9 +539,9 @@ namespace InDet {
}
uint8_t nBLHits(0);
- if( track->summaryValue(dummy,xAOD::numberOfBLayerHits))
+ if( track->summaryValue(dummy,xAOD::numberOfInnermostPixelLayerHits))
nBLHits += dummy;
- if( track->summaryValue(dummy, xAOD::numberOfBLayerOutliers))
+ if( track->summaryValue(dummy, xAOD::numberOfInnermostPixelLayerOutliers))
nBLHits += dummy;
if(nBLHits > m_maxBLhits)
{
diff --git a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx
index 2be96486d9f..839cc6f80bc 100644
--- a/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx
+++ b/InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils/src/PVFindingTrackFilter_cxx
@@ -47,7 +47,7 @@ namespace Trk
declareProperty("maxD0", m_maxD0);
declareProperty("maxD0overSigmaD0", m_maxD0overSigmaD0);
declareProperty("numberOfPixelHits", m_numberOfPixelHits);
- declareProperty("numberOfBLayerHits", m_numberOfBLayerHits);
+ declareProperty("numberOfInnermostPixelLayerHits", m_numberOfBLayerHits);
declareProperty("TrackSummaryTool", m_trackSumTool);
}//end of constructor
@@ -106,7 +106,7 @@ namespace Trk
// std::cout<<" Getting to the number of hits "<<std::endl;
int nPixelHits = summary->get(Trk::numberOfPixelHits);
- int nBLayerHits = summary->get(Trk::numberOfBLayerHits);
+ int nBLayerHits = summary->get(Trk::numberOfInnermostPixelLayerHits);
// std::cout<<"Number of pixel hits: "<<nPixelHits<<"Number of b-layer hits: "<<nBLayerHits<<std::endl;
diff --git a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
index ded2c2a1bc4..9acf7799037 100644
--- a/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestBLayer/src/InDetTestBLayerTool.cxx
@@ -285,7 +285,7 @@ namespace InDet {
if(!recompute){
const Trk::TrackSummary* ts = track->trackSummary();
if(ts){
- int ehbl = ts->get(Trk::expectBLayerHit);
+ int ehbl = ts->get(Trk::expectInnermostPixelLayerHit);
if(0==ehbl || 1==ehbl ){
ATH_MSG_DEBUG("Found expectHitInBLayer info in TrackSummary: return cached value" );
return ehbl;
@@ -384,7 +384,7 @@ namespace InDet {
if(!recompute){
const Trk::TrackSummary* ts = track->trackSummary();
if(ts){
- int ehbl = ts->get(Trk::expectBLayerHit);
+ int ehbl = ts->get(Trk::expectInnermostPixelLayerHit);
if(0==ehbl || 1==ehbl ){
ATH_MSG_DEBUG("Found expectHitInBLayer info in TrackSummary: return cached value" );
return ehbl;
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
index 4fd3fecbb2d..0d5104a3513 100644
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
@@ -214,12 +214,12 @@ namespace InDet {
int ehbl = -1;
const Trk::TrackSummary* ts = track->trackSummary();
if(ts){
- ehbl = ts->get(Trk::expectBLayerHit);
+ ehbl = ts->get(Trk::expectInnermostPixelLayerHit);
}
if(!recompute && pixel_layer==0){
if(ts){
- ehbl = ts->get(Trk::expectBLayerHit);
+ ehbl = ts->get(Trk::expectInnermostPixelLayerHit);
if(0==ehbl || 1==ehbl ){
m_cachedTrkParam = 0;
m_cachedFracGood=-1;
@@ -277,7 +277,7 @@ namespace InDet {
int ehbl = -1;
const Trk::TrackSummary* ts = track->trackSummary();
if(ts){
- ehbl = ts->get(Trk::expectBLayerHit);
+ ehbl = ts->get(Trk::expectInnermostPixelLayerHit);
}
if(!recompute && pixel_layer==0){
diff --git a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/InDetAmbiScoringTool.cxx b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/InDetAmbiScoringTool.cxx
index c1fba47fdbd..ae1eb66f694 100755
--- a/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/InDetAmbiScoringTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackScoringTools/src/InDetAmbiScoringTool.cxx
@@ -84,8 +84,8 @@ InDet::InDetAmbiScoringTool::InDetAmbiScoringTool(const std::string& t,
m_summaryTypeScore[Trk::numberOfPixelHits] = 20;
m_summaryTypeScore[Trk::numberOfPixelSharedHits] = -10; // NOT USED --- a shared hit is only half the weight
m_summaryTypeScore[Trk::numberOfPixelHoles] = -10; // a hole is bad
- m_summaryTypeScore[Trk::numberOfBLayerHits] = 10; // addition for being b-layer
- m_summaryTypeScore[Trk::numberOfBLayerSharedHits] = -5; // NOT USED --- a shared hit is only half the weight
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerHits] = 10; // addition for being b-layer
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerSharedHits] = -5; // NOT USED --- a shared hit is only half the weight
m_summaryTypeScore[Trk::numberOfGangedPixels] = -5; // decrease for being ganged
m_summaryTypeScore[Trk::numberOfGangedFlaggedFakes] = -10; // decrease for being ganged fake
m_summaryTypeScore[Trk::numberOfSCTHits] = 10; // half of a pixel, since only 1dim
@@ -475,7 +475,7 @@ Trk::TrackScore InDet::InDetAmbiScoringTool::ambigScore( const Trk::Track& track
<< " New score now: " << prob);
}
// --- Pixel blayer hits
- int bLayerHits = trackSummary.get(Trk::numberOfBLayerHits);
+ int bLayerHits = trackSummary.get(Trk::numberOfInnermostPixelLayerHits);
if (bLayerHits > -1 && m_maxB_LayerHits > 0) {
if (bLayerHits > m_maxB_LayerHits) {
prob *= (bLayerHits - m_maxB_LayerHits + 1); // hits are good !
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx
index 89ccd5229aa..bc448fa1bba 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetDetailedTrackSelectorTool.cxx
@@ -581,7 +581,7 @@ namespace InDet
}
- int nb = getCount(tp,xAOD::numberOfBLayerHits );
+ int nb = getCount(tp,xAOD::numberOfInnermostPixelLayerHits );
int np = getCount(tp,xAOD::numberOfPixelHits );
int npd = getCount(tp,xAOD::numberOfPixelDeadSensors );
int ns = getCount(tp,xAOD::numberOfSCTHits );
@@ -724,7 +724,7 @@ namespace InDet
if (m_useSharedHitInfo) {
- int nbs = getCount(tp,xAOD::numberOfBLayerSharedHits);
+ int nbs = getCount(tp,xAOD::numberOfInnermostPixelLayerSharedHits);
if (nbs>1) nbs=1;
if(nbs>m_nSharedBLayer) {
ATH_MSG_DEBUG("Track rejected because of nSharedBLayer "<<nbs<<" < "<<m_nSharedBLayer);
@@ -958,7 +958,7 @@ namespace InDet
return false;
}
- int nb = summary->get(Trk::numberOfBLayerHits);
+ int nb = summary->get(Trk::numberOfInnermostPixelLayerHits);
if(nb<0) nb=0;
@@ -1136,7 +1136,7 @@ namespace InDet
if (useSharedHitInfo) {
- int nbs = summary->get(Trk::numberOfBLayerSharedHits);
+ int nbs = summary->get(Trk::numberOfInnermostPixelLayerSharedHits);
if(nbs < 0) nbs = 0;
if (nbs>1) nbs=1;
if(nbs>m_nSharedBLayer) {
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
index 8d04bf92252..bafa9074e64 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/src/InDetTrackSelectorTool.cxx
@@ -37,7 +37,7 @@ InDetTrackSelectorTool::InDetTrackSelectorTool(const std::string & t, const std:
declareProperty("maxD0", m_maxD0);
declareProperty("maxD0overSigmaD0", m_maxD0overSigmaD0);
declareProperty("numberOfPixelHits", m_numberOfPixelHits);
- declareProperty("numberOfBLayerHits", m_numberOfBLayerHits);
+ declareProperty("numberOfInnermostPixelLayerHits", m_numberOfBLayerHits);
declareProperty("TrackSummaryTool", m_trackSumTool);
declareProperty("Extrapolator", m_extrapolator);
}
@@ -112,7 +112,7 @@ bool InDetTrackSelectorTool::decision(const Trk::Track & track, const Trk::Verte
if (nPixelDead<0)
nPixelDead=0;
- int nBLayerHits = summary->get(Trk::numberOfBLayerHits);
+ int nBLayerHits = summary->get(Trk::numberOfInnermostPixelLayerHits);
if(nPixelHits+nPixelDead<m_numberOfPixelHits || nBLayerHits<m_numberOfBLayerHits )
return false;
@@ -137,7 +137,7 @@ bool InDetTrackSelectorTool::decision(const Trk::TrackParticleBase & track, cons
if (nPixelDead<0)
nPixelDead=0;
- int nBLayerHits = summary->get(Trk::numberOfBLayerHits);
+ int nBLayerHits = summary->get(Trk::numberOfInnermostPixelLayerHits);
if(nPixelHits+nPixelDead<m_numberOfPixelHits || nBLayerHits<m_numberOfBLayerHits )
return false;
diff --git a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx
index a551d84e534..46f53540a64 100755
--- a/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSummaryHelperTool/src/InDetTrackSummaryHelperTool.cxx
@@ -161,7 +161,7 @@ void InDet::InDetTrackSummaryHelperTool::analyse(const Trk::Track& track,
if (isOutlier && !ispatterntrack ) { // ME: outliers on pattern tracks may be reintegrated by fitter, so count them as hits
information[Trk::numberOfPixelOutliers]++;
if (m_pixelId->is_blayer(id)){
- information[Trk::numberOfBLayerOutliers]++;
+ information[Trk::numberOfInnermostPixelLayerOutliers]++;
}
if (m_pixelId->layer_disk(id)==0 && m_pixelId->is_barrel(id)){
information[Trk::numberOfInnermostPixelLayerOutliers]++;
@@ -183,7 +183,7 @@ void InDet::InDetTrackSummaryHelperTool::analyse(const Trk::Track& track,
else {
information[Trk::numberOfPixelHits]++;
- if ( (m_pixelId->is_blayer(id) ) ) information[Trk::numberOfBLayerHits]++; // found b layer hit
+ if ( (m_pixelId->is_blayer(id) ) ) information[Trk::numberOfInnermostPixelLayerHits]++; // found b layer hit
if (m_pixelId->layer_disk(id)==0 && m_pixelId->is_barrel(id)) information[Trk::numberOfInnermostPixelLayerHits]++;
if (m_pixelId->layer_disk(id)==1 && m_pixelId->is_barrel(id)) information[Trk::numberOfNextToInnermostPixelLayerHits]++;
// check to see if there's an ambiguity with the ganged cluster.
@@ -193,7 +193,7 @@ void InDet::InDetTrackSummaryHelperTool::analyse(const Trk::Track& track,
} else {
const InDet::PixelCluster* pixPrd = pix->prepRawData();
if ( pixPrd && pixPrd->isSplit() ){ information[Trk::numberOfPixelSplitHits]++; hitIsSplit=true; }
- if ( pixPrd && m_pixelId->is_blayer(id) && pixPrd->isSplit() ) information[Trk::numberOfBLayerSplitHits]++;
+ if ( pixPrd && m_pixelId->is_blayer(id) && pixPrd->isSplit() ) information[Trk::numberOfInnermostLayerSplitHits]++;
if ( pixPrd && m_pixelId->is_barrel(id) && m_pixelId->layer_disk(id)==0 && pixPrd->isSplit() ) information[Trk::numberOfInnermostLayerSplitHits]++;
if ( pixPrd && m_pixelId->is_barrel(id) && m_pixelId->layer_disk(id)==1 && pixPrd->isSplit() ) information[Trk::numberOfNextToInnermostLayerSplitHits]++;
if ( pix->isBroadCluster() ) information[Trk::numberOfPixelSpoiltHits]++;
@@ -370,24 +370,24 @@ void InDet::InDetTrackSummaryHelperTool::searchForHoles(const Trk::Track& track,
if ( information[Trk::numberOfContribPixelLayers] == 0 ) {
ATH_MSG_DEBUG("No pxiels on track, so wo do not expect a B-Layer hit !");
- information[Trk::expectBLayerHit] = 0;
+ information[Trk::expectInnermostPixelLayerHit] = 0;
information[Trk::expectInnermostPixelLayerHit] = 0;
information[Trk::expectNextToInnermostPixelLayerHit] = 0;
} else{
///blayer block
- if ( information[Trk::numberOfBLayerHits] > 0) {
+ if ( information[Trk::numberOfInnermostPixelLayerHits] > 0) {
ATH_MSG_DEBUG("B-Layer hit on track, so we expect a B-Layer hit !");
- information[Trk::expectBLayerHit] = 1;
+ information[Trk::expectInnermostPixelLayerHit] = 1;
} else {
ATH_MSG_DEBUG("Testing B-Layer using tool..");
if (m_testBLayerTool->expectHitInBLayer(&track) ) {
ATH_MSG_DEBUG("expect B-Layer hit !");
- information[Trk::expectBLayerHit] = 1;
+ information[Trk::expectInnermostPixelLayerHit] = 1;
} else {
ATH_MSG_DEBUG("do not expect B-Layer hit !");
- information[Trk::expectBLayerHit] = 0;
+ information[Trk::expectInnermostPixelLayerHit] = 0;
}
}
@@ -432,14 +432,14 @@ void InDet::InDetTrackSummaryHelperTool::updateSharedHitCount(const Trk::Track &
// loop over track states on surface and take pixel / sct to update the shared hit count
summary.m_information[Trk::numberOfPixelSharedHits] = 0;
- summary.m_information[Trk::numberOfBLayerSharedHits] = 0;
+ summary.m_information[Trk::numberOfInnermostPixelLayerSharedHits] = 0;
summary.m_information[Trk::numberOfInnermostPixelLayerSharedHits] = 0;
summary.m_information[Trk::numberOfNextToInnermostPixelLayerSharedHits] = 0;
summary.m_information[Trk::numberOfSCTSharedHits] = 0;
summary.m_information[Trk::numberOfTRTSharedHits] = 0;
if( m_runningTIDE_Ambi ) {
summary.m_information[Trk::numberOfPixelSplitHits] = 0;
- summary.m_information[Trk::numberOfBLayerSplitHits] = 0;
+ summary.m_information[Trk::numberOfInnermostLayerSplitHits] = 0;
summary.m_information[Trk::numberOfInnermostLayerSplitHits] = 0;
summary.m_information[Trk::numberOfNextToInnermostLayerSplitHits] = 0;
}
@@ -461,7 +461,7 @@ void InDet::InDetTrackSummaryHelperTool::updateSharedHitCount(const Trk::Track &
if ( pixPrd && pixPrd->isSplit() ){
summary.m_information[Trk::numberOfPixelSplitHits]++;
hitIsSplit=true;
- if ( m_pixelId->is_blayer(id)) summary.m_information[Trk::numberOfBLayerSplitHits]++;
+ if ( m_pixelId->is_blayer(id)) summary.m_information[Trk::numberOfInnermostLayerSplitHits]++;
if ( m_pixelId->is_barrel(id) && m_pixelId->layer_disk(id)==0) summary.m_information[Trk::numberOfInnermostLayerSplitHits]++;
if ( m_pixelId->is_barrel(id) && m_pixelId->layer_disk(id)==1) summary.m_information[Trk::numberOfNextToInnermostLayerSplitHits]++;
}
@@ -475,7 +475,7 @@ void InDet::InDetTrackSummaryHelperTool::updateSharedHitCount(const Trk::Track &
summary.m_information[Trk::numberOfPixelSharedHits]++;
if ( (m_pixelId->is_blayer(id) ) ) {
ATH_MSG_DEBUG("--> shared Pixel hit is in b-layer");
- summary.m_information[Trk::numberOfBLayerSharedHits]++;
+ summary.m_information[Trk::numberOfInnermostPixelLayerSharedHits]++;
}
if ( (m_pixelId->is_barrel(id) && m_pixelId->layer_disk(id)==0) ) {
ATH_MSG_DEBUG("--> shared Pixel hit is in Innermost Pixel layer");
@@ -516,24 +516,24 @@ void InDet::InDetTrackSummaryHelperTool::updateExpectedHitInfo(const Trk::Track
if ( summary.m_information[Trk::numberOfContribPixelLayers] == 0 ) {
ATH_MSG_DEBUG("No pxiels on track, so wo do not expect a B-Layer hit !");
- summary.m_information[Trk::expectBLayerHit] = 0;
+ summary.m_information[Trk::expectInnermostPixelLayerHit] = 0;
summary.m_information[Trk::expectInnermostPixelLayerHit] = 0;
summary.m_information[Trk::expectNextToInnermostPixelLayerHit] = 0;
} else{
///blayer block
- if ( summary.m_information[Trk::numberOfBLayerHits] > 0) {
+ if ( summary.m_information[Trk::numberOfInnermostPixelLayerHits] > 0) {
ATH_MSG_DEBUG("B-Layer hit on track, so we expect a B-Layer hit !");
- summary.m_information[Trk::expectBLayerHit] = 1;
+ summary.m_information[Trk::expectInnermostPixelLayerHit] = 1;
} else {
ATH_MSG_DEBUG("Testing B-Layer using tool..");
if (m_testBLayerTool->expectHitInBLayer(&track) ) {
ATH_MSG_DEBUG("expect B-Layer hit !");
- summary.m_information[Trk::expectBLayerHit] = 1;
+ summary.m_information[Trk::expectInnermostPixelLayerHit] = 1;
} else {
ATH_MSG_DEBUG("do not expect B-Layer hit !");
- summary.m_information[Trk::expectBLayerHit] = 0;
+ summary.m_information[Trk::expectInnermostPixelLayerHit] = 0;
}
}
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx
index 4080858570c..d6330407e4d 100755
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/InDetVKalPriVxFinder.cxx
@@ -307,7 +307,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
const Trk::TrackSummary* testSum = m_sumSvc->createSummary(*(*i_ntrk));
PixelHits = (long int) testSum->get(Trk::numberOfPixelHits);
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
- BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
+ BLayHits = (long int) testSum->get(Trk::numberOfInnermostPixelLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
if(PixelHits<0)PixelHits=0;
if(SctHits<0)SctHits=0;
@@ -347,7 +347,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
const Trk::TrackSummary* testSum = m_sumSvc->createSummary(*(*i_ntrk));
PixelHits = (long int) testSum->get(Trk::numberOfPixelHits);
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
- BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
+ BLayHits = (long int) testSum->get(Trk::numberOfInnermostPixelLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
if(PixelHits<0)PixelHits=0;
if(SctHits<0)SctHits=0;
@@ -484,7 +484,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
const Trk::TrackSummary* testSum = (*i_nprt)->trackSummary();
PixelHits = (long int) testSum->get(Trk::numberOfPixelHits);
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
- BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
+ BLayHits = (long int) testSum->get(Trk::numberOfInnermostPixelLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
if(PixelHits<0)PixelHits=0;
if(SctHits<0)SctHits=0;
@@ -521,7 +521,7 @@ InDetVKalPriVxFinderTool::InDetVKalPriVxFinderTool(const std::string& type,
const Trk::TrackSummary* testSum = (*i_nprt)->trackSummary();
PixelHits = (long int) testSum->get(Trk::numberOfPixelHits);
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
- BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
+ BLayHits = (long int) testSum->get(Trk::numberOfInnermostPixelLayerHits);
SharedHits= (long int) testSum->get(Trk::numberOfPixelSharedHits);
if(PixelHits<0)PixelHits=0;
if(SctHits<0)SctHits=0;
diff --git a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx
index 8f6a04ae31c..b85ae1c93c5 100755
--- a/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalPriVxFinderTool/src/Utilities.cxx
@@ -296,7 +296,7 @@ namespace InDet {
//----------------------------------- Summary tools
if(m_SummaryToolExist) {
const Trk::TrackSummary* testSum = m_sumSvc->createSummary(*(*i_ntrk));
- if( testSum->get(Trk::numberOfBLayerHits) <= 0) continue;
+ if( testSum->get(Trk::numberOfInnermostPixelLayerHits) <= 0) continue;
}
mapTracks.insert( std::pair<double, const Trk::Track*>(pmom,(*i_ntrk)));
}
@@ -333,7 +333,7 @@ namespace InDet {
double pmom = sin(VectPerig[3])/fabs(VectPerig[4]);
//----------------------------------- Summary tools
const Trk::TrackSummary* testSum = (*i_nprt)->trackSummary();
- if( testSum->get(Trk::numberOfBLayerHits) <=0 ) continue;
+ if( testSum->get(Trk::numberOfInnermostPixelLayerHits) <=0 ) continue;
mapTracks.insert( std::pair<double, const Trk::TrackParticleBase*>(pmom,(*i_nprt)));
}
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.cxx
index 2a469711e73..b3f1e142c4c 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/CutTrk.cxx
@@ -92,7 +92,7 @@ namespace InDet{
const Trk::TrackSummary* testSum = (*i_ntrk)->trackSummary();
PixelHits = (long int) testSum->get(Trk::numberOfPixelHits);
SctHits = (long int) testSum->get(Trk::numberOfSCTHits);
- BLayHits = (long int) testSum->get(Trk::numberOfBLayerHits);
+ BLayHits = (long int) testSum->get(Trk::numberOfInnermostPixelLayerHits);
if(PixelHits < 0 ) PixelHits=0;
if(SctHits < 0 ) SctHits=0;
if(BLayHits < 0 ) BLayHits=0;
@@ -213,9 +213,9 @@ namespace InDet{
if( !((*i_ntrk)->summaryValue(splPixHits,xAOD::numberOfPixelSpoiltHits)))splPixHits=0;
if( !((*i_ntrk)->summaryValue(outPixHits,xAOD::numberOfPixelOutliers))) outPixHits=0;
//uint8_t BLaySharedH,BLaySplitH,BLayOutlier;
- //if( !((*i_ntrk)->summaryValue(BLaySharedH,xAOD::numberOfBLayerSharedHits)) ) BLaySharedH=-1;
- //if( !((*i_ntrk)->summaryValue(BLaySplitH ,xAOD::numberOfBLayerSplitHits)) ) BLaySplitH=-1;
- //if( !((*i_ntrk)->summaryValue(BLayOutlier,xAOD::numberOfBLayerOutliers)) ) BLayOutlier=-1;
+ //if( !((*i_ntrk)->summaryValue(BLaySharedH,xAOD::numberOfInnermostPixelLayerSharedHits)) ) BLaySharedH=-1;
+ //if( !((*i_ntrk)->summaryValue(BLaySplitH ,xAOD::numberOfInnermostPixelLayerSplitHits)) ) BLaySplitH=-1;
+ //if( !((*i_ntrk)->summaryValue(BLayOutlier,xAOD::numberOfInnermostPixelLayerOutliers)) ) BLayOutlier=-1;
//std::cout<<"NwBlayer="<<(long int)BLaySharedH<<", "<<(long int)BLaySplitH<<", "<<(long int)BLayOutlier<<'\n';
//uint8_t InmHits,InmSharedH,InmSplitH,InmOutlier;
//if( !((*i_ntrk)->summaryValue(InmHits, xAOD::numberOfInnermostHits)) ) InmHits=-1;
diff --git a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.cxx b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.cxx
index fa2d04c594b..ec39dc15579 100755
--- a/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.cxx
+++ b/InnerDetector/InDetRecTools/InDetVKalVxInJetTool/src/Utilities.cxx
@@ -585,7 +585,7 @@ namespace InDet{
// bitH=HitPattern&((int)pow(2,Trk::pixelBarrel1));
} else { // 3-layer pixel detector
uint8_t BLhit,NPlay,NHoles,IBLhit;
- if(!Part->summaryValue( BLhit, xAOD::numberOfBLayerHits) ) BLhit = 0;
+ if(!Part->summaryValue( BLhit, xAOD::numberOfInnermostPixelLayerHits) ) BLhit = 0;
if(!Part->summaryValue(IBLhit, xAOD::numberOfInnermostPixelLayerHits) ) IBLhit = 0; // Some safety
BLhit=BLhit>IBLhit ? BLhit : IBLhit; // Some safety
if(!Part->summaryValue( NPlay, xAOD::numberOfContribPixelLayers) ) NPlay = 0;
diff --git a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
index af5c22fe466..d3405ab128b 100755
--- a/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
+++ b/InnerDetector/InDetValidation/InDetPerformanceRTT/src/IDStandardPerformance.cxx
@@ -2828,7 +2828,7 @@ IDStandardPerformance::MakeTrackPlots(const DataVector<Trk::Track>* trks,
const Trk::TrackSummary* summary = m_trkSummaryTool->createSummary(**trksItr);
if (summary) {
// Fill impact parameter significance for different numbers of shared hits
- if (summary->get(Trk::numberOfBLayerSharedHits)>0) {
+ if (summary->get(Trk::numberOfInnermostPixelLayerSharedHits)>0) {
m_d0sig_pt1_sharedBL->Fill(trkd0/trkd0err);
}
if (summary->get(Trk::numberOfPixelSharedHits)>0) {
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ExtendedFakes.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ExtendedFakes.cxx
index ad224d4fb92..57a502030c6 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ExtendedFakes.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_ExtendedFakes.cxx
@@ -63,16 +63,16 @@ InDetPerfPlot_ExtendedFakes::fill(const xAOD::TrackParticle& trk, const bool isF
uint8_t iTRTHits(0), iTRTHighThresholdHits(0), iTRTOutliers(0), iTRTHighThresholdOutliers(0);
- if (trk.summaryValue(iBLayerHits, xAOD::numberOfBLayerHits)) {
+ if (trk.summaryValue(iBLayerHits, xAOD::numberOfInnermostPixelLayerHits)) {
fillHisto(m_HitInfoFakerates["nBLayerHits" ], iBLayerHits, fakeNum);
}
- if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfBLayerOutliers)) {
+ if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfInnermostPixelLayerOutliers)) {
fillHisto(m_HitInfoFakerates["nBLayerOutliers" ], iBLayerOutliers, fakeNum);
}
- if (trk.summaryValue(iBLayerSharedHits, xAOD::numberOfBLayerSharedHits)) {
+ if (trk.summaryValue(iBLayerSharedHits, xAOD::numberOfInnermostPixelLayerSharedHits)) {
fillHisto(m_HitInfoFakerates["nBLayerSharedHits"], iBLayerSharedHits, fakeNum);
}
- if (trk.summaryValue(iBLayerSplitHits, xAOD::numberOfBLayerSplitHits)) {
+ if (trk.summaryValue(iBLayerSplitHits, xAOD::numberOfInnermostPixelLayerSplitHits)) {
fillHisto(m_HitInfoFakerates["nBLayerSplitHits" ], iBLayerSplitHits, fakeNum);
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_HitDetailed.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_HitDetailed.cxx
index 793d499e747..007586932e8 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_HitDetailed.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_HitDetailed.cxx
@@ -115,7 +115,7 @@ InDetPerfPlot_HitDetailed::fill(const xAOD::TrackParticle& trk) {
uint8_t iBLayerHits(0), iPixHits(0), iSctHits(0), iTrtHits(0);
uint8_t iPixHoles(0), iSCTHoles(0), iTrtHTHits(0);
- if (trk.summaryValue(iBLayerHits, xAOD::numberOfBLayerHits)) {
+ if (trk.summaryValue(iBLayerHits, xAOD::numberOfInnermostPixelLayerHits)) {
fillHisto(nBLayerHits, iBLayerHits);
fillHisto(n_vs_eta_BLayerHits, eta, iBLayerHits);
}
@@ -151,15 +151,15 @@ InDetPerfPlot_HitDetailed::fill(const xAOD::TrackParticle& trk) {
0);
uint8_t iSCTOutliers(0), iSCTDoubleHoles(0), iSCTShared(0);
uint8_t iTRTOutliers(0), iTRTHTOutliers(0);
- if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfBLayerOutliers)) {
+ if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfInnermostPixelLayerOutliers)) {
fillHisto(nBLayerOutliers, iBLayerOutliers);
fillHisto(n_vs_eta_BLayerOutliers, eta, iBLayerOutliers);
}
- if (trk.summaryValue(iBLayerShared, xAOD::numberOfBLayerSharedHits)) {
+ if (trk.summaryValue(iBLayerShared, xAOD::numberOfInnermostPixelLayerSharedHits)) {
fillHisto(nBLayerSharedHits, iBLayerShared);
fillHisto(n_vs_eta_BLayerSharedHits, eta, iBLayerShared);
}
- if (trk.summaryValue(iBLayerSplit, xAOD::numberOfBLayerSplitHits)) {
+ if (trk.summaryValue(iBLayerSplit, xAOD::numberOfInnermostPixelLayerSplitHits)) {
fillHisto(nBLayerSplitHits, iBLayerSplit);
fillHisto(n_vs_eta_BLayerSplitHits, eta, iBLayerSplit);
}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx
index 4556d756cca..0ebb8e30f06 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/InDetPerfPlot_TrkInJet.cxx
@@ -281,7 +281,7 @@ InDetPerfPlot_TrkInJet::fill(const xAOD::TrackParticle& trk, const xAOD::Jet& je
fillHisto(m_recPt, trk.pt() / 1e3);
- if (trk.summaryValue(iBLayerHits, xAOD::numberOfBLayerHits)) {
+ if (trk.summaryValue(iBLayerHits, xAOD::numberOfInnermostPixelLayerHits)) {
fillHisto(n_vs_jetDR_BLayerHits, jetDR, iBLayerHits);
}
if (trk.summaryValue(iPixHits, xAOD::numberOfPixelHits)) {
@@ -309,13 +309,13 @@ InDetPerfPlot_TrkInJet::fill(const xAOD::TrackParticle& trk, const xAOD::Jet& je
uint8_t iPixelOutliers(0), iPixelContribLayers(0), iPixelShared(0), iPixelSplit(0), iPixelGanged(0);
uint8_t iSCTOutliers(0), iSCTDoubleHoles(0), iSCTShared(0);
uint8_t iTRTOutliers(0), iTRTHTOutliers(0);
- if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfBLayerOutliers)) {
+ if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfInnermostPixelLayerOutliers)) {
fillHisto(n_vs_jetDR_BLayerOutliers, jetDR, iBLayerOutliers);
}
- if (trk.summaryValue(iBLayerShared, xAOD::numberOfBLayerSharedHits)) {
+ if (trk.summaryValue(iBLayerShared, xAOD::numberOfInnermostPixelLayerSharedHits)) {
fillHisto(n_vs_jetDR_BLayerSharedHits, jetDR, iBLayerShared);
}
- if (trk.summaryValue(iBLayerSplit, xAOD::numberOfBLayerSplitHits)) {
+ if (trk.summaryValue(iBLayerSplit, xAOD::numberOfInnermostPixelLayerSplitHits)) {
fillHisto(n_vs_jetDR_BLayerSplitHits, jetDR, iBLayerSplit);
}
if (trk.summaryValue(iPixelOutliers, xAOD::numberOfPixelOutliers)) {
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx
index 6c8ce32c2a9..70d1287ff5e 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/src/TrackSelectionTool.cxx
@@ -218,16 +218,16 @@ TrackSelectionTool::accept(const xAOD::TrackParticle* p) const {
// uint8_t iSiHits(0);//unused?
uint8_t iTRTHits(0), iTRTHTHits(0), iTRTOutliers(0), iTRTHTOutliers(0);
- if (!p->summaryValue(iBLayerHits, xAOD::numberOfBLayerHits)) {
+ if (!p->summaryValue(iBLayerHits, xAOD::numberOfInnermostPixelLayerHits)) {
return m_accept;
}
- if (!p->summaryValue(iBLayerOutliers, xAOD::numberOfBLayerOutliers)) {
+ if (!p->summaryValue(iBLayerOutliers, xAOD::numberOfInnermostPixelLayerOutliers)) {
return m_accept;
}
- if (!p->summaryValue(iBLayerSharedHits, xAOD::numberOfBLayerSharedHits)) {
+ if (!p->summaryValue(iBLayerSharedHits, xAOD::numberOfInnermostPixelLayerSharedHits)) {
return m_accept;
}
- if (!p->summaryValue(iBLayerSplitHits, xAOD::numberOfBLayerSplitHits)) {
+ if (!p->summaryValue(iBLayerSplitHits, xAOD::numberOfInnermostPixelLayerSplitHits)) {
return m_accept;
}
diff --git a/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx b/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx
index a0a50c89a15..8b6c220dea4 100755
--- a/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx
+++ b/InnerDetector/InDetValidation/InDetRecStatistics/src/TrackStatHelper.cxx
@@ -806,9 +806,9 @@ bool InDet::TrackStatHelper::printTrackSummaryRegion(enum track_types track_type
else
std::cout << std::setw(6) << "n/a";
- std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfBLayerHits );
- std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfBLayerSharedHits );
- std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfBLayerOutliers);
+ std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfInnermostPixelLayerHits );
+ std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfInnermostPixelLayerSharedHits );
+ std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfInnermostPixelLayerOutliers);
std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfPixelHits );
std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfPixelSharedHits );
std::cout << std::setw(6) << std::setprecision(2); printTrackSummaryAverage( track_type , eta_region, Trk::numberOfPixelHoles );
diff --git a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackScoringTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackScoringTool.cxx
index 199a4aafea8..427462516b8 100755
--- a/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackScoringTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonTrackScoringTool.cxx
@@ -37,8 +37,8 @@ namespace Muon {
m_summaryTypeScore[Trk::numberOfPixelSharedHits] = -10; // a shared hit is only half the weight
m_summaryTypeScore[Trk::numberOfPixelHoles] = -10; // a hole is bad
- m_summaryTypeScore[Trk::numberOfBLayerHits] = 10; // addition for being b-layer
- m_summaryTypeScore[Trk::numberOfBLayerSharedHits] = -5; // a shared hit is only half the weight
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerHits] = 10; // addition for being b-layer
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerSharedHits] = -5; // a shared hit is only half the weight
m_summaryTypeScore[Trk::numberOfGangedPixels] = -5; // decrease for being ganged
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonPlots.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonPlots.cxx
index 583129a1568..bc100aadc2e 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonPlots.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/RecoMuonPlots.cxx
@@ -181,7 +181,7 @@ void RecoMuonPlots::fill(const xAOD::Muon& mu, xAOD::Muon::Quality my_quality){
if (!mu.summaryValue(hitval_etaLayer3Hits, xAOD::MuonSummaryType::etaLayer3Hits)) return;
if (!mu.summaryValue(hitval_etaLayer4Hits, xAOD::MuonSummaryType::etaLayer4Hits)) return;
- if (!mu.summaryValue(hitval_numberOfBLayerHits, xAOD::SummaryType::numberOfBLayerHits)) return;
+ if (!mu.summaryValue(hitval_numberOfBLayerHits, xAOD::SummaryType::numberOfInnermostPixelLayerHits)) return;
if (!mu.summaryValue(hitval_numberOfPixelHits, xAOD::SummaryType::numberOfPixelHits)) return;
if (!mu.summaryValue(hitval_numberOfSCTHits, xAOD::SummaryType::numberOfSCTHits)) return;
if (!mu.summaryValue(hitval_numberOfTRTHits, xAOD::SummaryType::numberOfTRTHits)) return;
diff --git a/MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/Root/IDHitSummaryPlots.cxx b/MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/Root/IDHitSummaryPlots.cxx
index f6d606ab82f..8083df63c49 100644
--- a/MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/Root/IDHitSummaryPlots.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonHistogramming/MuonHistUtils/Root/IDHitSummaryPlots.cxx
@@ -42,8 +42,8 @@ void IDHitSummaryPlots::fill(const xAOD::TrackParticle& trk)
float phi=trk.phi();
uint8_t iBLayerHits(0),bExpectBLayerHit(0);
- trk.summaryValue(bExpectBLayerHit,xAOD::expectBLayerHit);
- trk.summaryValue(iBLayerHits,xAOD::numberOfBLayerHits);
+ trk.summaryValue(bExpectBLayerHit,xAOD::expectInnermostPixelLayerHit);
+ trk.summaryValue(iBLayerHits,xAOD::numberOfInnermostPixelLayerHits);
nBLayerHitsIfExpected.fill(bExpectBLayerHit*iBLayerHits,eta,phi);
uint8_t iPixHits(0),iPixDead(0);
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
index 2750bdd6d30..52930ebf929 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
@@ -113,9 +113,9 @@ bool MuonPerformanceAlg::passID(const xAOD::TrackParticle* tp, bool debug) const
if( tp ){
// check blayer
- tp->summaryValue(eblh,xAOD::expectBLayerHit);
- tp->summaryValue(nblh,xAOD::numberOfBLayerHits);
- tp->summaryValue(nblo,xAOD::numberOfBLayerOutliers);
+ tp->summaryValue(eblh,xAOD::expectInnermostPixelLayerHit);
+ tp->summaryValue(nblh,xAOD::numberOfInnermostPixelLayerHits);
+ tp->summaryValue(nblo,xAOD::numberOfInnermostPixelLayerOutliers);
if( static_cast<int>(eblh) ==0 ||
static_cast<int>(nblh) + static_cast<int>(nblo) > 0 ) tightness += 1;
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
index c3bbb205801..bae4ff90946 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/JetTagAna.cxx
@@ -505,8 +505,8 @@ StatusCode JetTagAna::execute() {
if(trackParticle->pt()<1000.) continue;
const Trk::TrackSummary* summary = trackParticle->trackSummary();
if (summary) {
- m_h_global_BLayerHits->Fill((float) summary->get(Trk::numberOfBLayerHits));
- m_h_global_BLayerSharedHits->Fill((float) summary->get(Trk::numberOfBLayerSharedHits));
+ m_h_global_BLayerHits->Fill((float) summary->get(Trk::numberOfInnermostPixelLayerHits));
+ m_h_global_BLayerSharedHits->Fill((float) summary->get(Trk::numberOfInnermostPixelLayerSharedHits));
m_h_global_PixelHits->Fill((float) summary->get(Trk::numberOfPixelHits));
m_h_global_PixelLayers->Fill((float) summary->get(Trk::numberOfContribPixelLayers));
m_h_global_TRTHits->Fill((float) summary->get(Trk::numberOfTRTHits));
@@ -642,7 +642,7 @@ StatusCode JetTagAna::execute() {
const Trk::TrackSummary* summary = aTemp->trackSummary();
if (summary) {
- m_h_jet_tracks_BLayerHits->Fill((float) summary->get(Trk::numberOfBLayerHits));
+ m_h_jet_tracks_BLayerHits->Fill((float) summary->get(Trk::numberOfInnermostPixelLayerHits));
m_h_jet_tracks_PixelHits->Fill((float) summary->get(Trk::numberOfPixelHits));
m_h_jet_tracks_SCTHits->Fill((float) summary->get(Trk::numberOfSCTHits));
}
@@ -1532,7 +1532,7 @@ StatusCode JetTagAna::checkTrackqualforSET(Rec::TrackParticleContainer::const_it
const Trk::TrackSummary* summary = (*trackItr)->trackSummary();
if (summary) {
// number of b-layer hits
- nBL = summary->get(Trk::numberOfBLayerHits);
+ nBL = summary->get(Trk::numberOfInnermostPixelLayerHits);
// number of pixel hits
nPix = summary->get(Trk::numberOfPixelHits);
// number of Si hits
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/TrackExample.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/TrackExample.cxx
index d320b4a8d4b..9ee711a23f2 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/TrackExample.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisExamples/src/TrackExample.cxx
@@ -172,7 +172,7 @@ StatusCode TrackExample::execute() {
/// access to TrackSummary information
ATH_MSG_DEBUG( "Track summary information:" );
uint8_t ival = 0;
- if( trackParticle->summaryValue( ival, xAOD::numberOfBLayerHits ) ) {
+ if( trackParticle->summaryValue( ival, xAOD::numberOfInnermostPixelLayerHits ) ) {
ATH_MSG_DEBUG( " * Number of B layer hits : " << ( int ) ival );
}
if( trackParticle->summaryValue( ival, xAOD::numberOfPixelHits ) ) {
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ElectronIDSelectorCore.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ElectronIDSelectorCore.cxx
index 8c27e4a31c2..04c50490ac0 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ElectronIDSelectorCore.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisUtils/src/ElectronIDSelectorCore.cxx
@@ -241,8 +241,8 @@ bool ElectronIDSelectorCore::accept( const INavigable4Momentum *part ) const
// Check for the b-layer requirement if RobusterTight is requested
if ( m_isEM_NoConvCut != 0 )
{
- bool expectBLayerHit = electron->detailValue( egammaParameters::expectHitInBLayer );
- if ( expectBLayerHit )
+ bool expectInnermostPixelLayerHit = electron->detailValue( egammaParameters::expectHitInBLayer );
+ if ( expectInnermostPixelLayerHit )
{
if ( electron->isem(m_isEM) != 0 )
{
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx
index c1fcf31a5e1..6a87ef7cf9c 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/ElectronRetriever.cxx
@@ -218,7 +218,7 @@ namespace JiveXML {
summary = (*elItr)->trackParticle()->trackSummary();
hasTrack.push_back( DataType( 1 ) );
- hitsBLayer.push_back( DataType( summary->get(Trk::numberOfBLayerHits) ));
+ hitsBLayer.push_back( DataType( summary->get(Trk::numberOfInnermostPixelLayerHits) ));
hitsPixel.push_back( DataType( summary->get(Trk::numberOfPixelHits) ));
hitsSCT.push_back( DataType( summary->get(Trk::numberOfSCTHits) ));
hitsTRT.push_back( DataType( summary->get(Trk::numberOfTRTHits) ));
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx
index 12bbdd5739a..1a57e649a86 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TrackParticleRetriever.cxx
@@ -242,7 +242,7 @@ namespace JiveXML {
if(tSum){
int nPixelHits = tSum->get(Trk::numberOfPixelHits);
int nSCTHits = tSum->get(Trk::numberOfSCTHits);
- int nBLayerHits = tSum->get(Trk::numberOfBLayerHits);
+ int nBLayerHits = tSum->get(Trk::numberOfInnermostPixelLayerHits);
int nTRTHits = tSum->get(Trk::numberOfTRTHits);
labelStr = "_PixelHits"+DataType( nPixelHits ).toString() + "_SCTHits"+DataType( nSCTHits ).toString() +
"_BLayerHits"+DataType( nBLayerHits ).toString() + "_TRTHits"+DataType( nTRTHits ).toString() ;
diff --git a/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx b/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx
index 3ee8850cf4d..c6fd70ea11f 100644
--- a/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx
+++ b/PhysicsAnalysis/D2PDMaker/src/D2PDTrackParticleSelector.cxx
@@ -204,7 +204,7 @@ StatusCode D2PDTrackParticleSelector::processObject( const Rec::TrackParticle* t
int nSctHits(0);
int nSiliconHits(0);
int nTrtHits(0);
- nBLayHits = trackSum->get(Trk::numberOfBLayerHits);
+ nBLayHits = trackSum->get(Trk::numberOfInnermostPixelLayerHits);
nPixelHits = trackSum->get(Trk::numberOfPixelHits);
nSctHits = trackSum->get(Trk::numberOfSCTHits);
nSiliconHits = nPixelHits + nSctHits + nBLayHits;
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/doc/muon-variables b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/doc/muon-variables
index 916620771b3..a0e082a2c1d 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/doc/muon-variables
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerConfig/doc/muon-variables
@@ -164,12 +164,12 @@ Quality tight
Detail 2
-MuonHitsSummary numberOfBLayerHits nBLHits
+MuonHitsSummary numberOfInnermostPixelLayerHits nBLHits
MuonHitsSummary numberOfPixelHits nPixHits
MuonHitsSummary numberOfSCTHits nSCTHits
MuonHitsSummary numberOfTRTHits nTRTHits
MuonHitsSummary numberOfTRTHighThresholdHits nTRTHighTHits
-MuonHitsSummary numberOfBLayerSharedHits nBLSharedHits
+MuonHitsSummary numberOfInnermostPixelLayerSharedHits nBLSharedHits
MuonHitsSummary numberOfPixelSharedHits nPixSharedHits
MuonHitsSummary numberOfPixelHoles nPixHoles
MuonHitsSummary numberOfSCTSharedHits nSCTSharedHits
diff --git a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
index 75dbad54bfc..f14596ecde6 100644
--- a/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/JetTagD3PDMaker/python/JetTagTrackD3PDObject.py
@@ -72,7 +72,7 @@ def getJetTagTrackD3PDObject(level=20, **kw):
jetTagD3PDInDetTrackSelectorTool.maxD0 = 99999.
jetTagD3PDInDetTrackSelectorTool.maxD0overSigmaD0 = 99999.
jetTagD3PDInDetTrackSelectorTool.numberOfPixelHits = -99
- jetTagD3PDInDetTrackSelectorTool.numberOfBLayerHits = -99
+ jetTagD3PDInDetTrackSelectorTool.numberOfInnermostPixelLayerHits = -99
jetTagD3PDInDetTrackSelectorTool.Extrapolator = ToolSvc.InDetExtrapolator
jetTagD3PDInDetTrackSelectorTool.TrackSummaryTool = ToolSvc.InDetTrackSummaryTool
ToolSvc+=jetTagD3PDInDetTrackSelectorTool
diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTrkHitFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTrkHitFillerTool.cxx
index 22efc93637c..6b5ac3f0f71 100644
--- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTrkHitFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonTrkHitFillerTool.cxx
@@ -28,12 +28,12 @@ const Var vars[] =
{
{"nOutliersOnTrack", xAOD::numberOfOutliersOnTrack, ID+MS},
- {"nBLHits", xAOD::numberOfBLayerHits, ID},
+ {"nBLHits", xAOD::numberOfInnermostPixelLayerHits, ID},
{"nPixHits", xAOD::numberOfPixelHits, ID},
{"nSCTHits", xAOD::numberOfSCTHits, ID},
{"nTRTHits", xAOD::numberOfTRTHits, ID},
{"nTRTHighTHits", xAOD::numberOfTRTHighThresholdHits, ID},
- {"nBLSharedHits", xAOD::numberOfBLayerSharedHits, ID},
+ {"nBLSharedHits", xAOD::numberOfInnermostPixelLayerSharedHits, ID},
{"nPixSharedHits", xAOD::numberOfPixelSharedHits, ID},
{"nPixHoles", xAOD::numberOfPixelHoles, ID},
{"nSCTSharedHits", xAOD::numberOfSCTSharedHits, ID},
@@ -44,7 +44,7 @@ const Var vars[] =
{"nPixelDeadSensors", xAOD::numberOfPixelDeadSensors, ID},
{"nSCTDeadSensors", xAOD::numberOfSCTDeadSensors, ID},
{"nTRTDeadStraws", xAOD::numberOfTRTDeadStraws, ID},
- {"expectBLayerHit", xAOD::expectBLayerHit, ID},
+ {"expectInnermostPixelLayerHit", xAOD::expectInnermostPixelLayerHit, ID},
{"nprecisionLayers", xAOD::numberOfPrecisionLayers, MS},
{"nprecisionHoleLayers", xAOD::numberOfPrecisionHoleLayers, MS},
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx
index ddc6c334b32..76a1a17444c 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileMuonFillerTool.cxx
@@ -109,12 +109,12 @@ StatusCode TileMuonFillerTool::book(){
// MUON HITS IN SUBDETECTORS
if(m_LevelOfDetails > 1){
// HIT NUMBERS IN SUBDETECTORS
- CHECK( addVariable("numberOfBLayerHits", m_numberOfBLayerHits, "", m_defaultValue));
+ CHECK( addVariable("numberOfInnermostPixelLayerHits", m_numberOfBLayerHits, "", m_defaultValue));
CHECK( addVariable("numberOfPixelHits", m_numberOfPixelHits, "", m_defaultValue));
CHECK( addVariable("numberOfSCTHits", m_numberOfSCTHits, "", m_defaultValue));
CHECK( addVariable("numberOfTRTHits", m_numberOfTRTHits, "", m_defaultValue));
CHECK( addVariable("numberOfTRTHighThresholdHits", m_numberOfTRTHighThresholdHits, "", m_defaultValue));
- CHECK( addVariable("numberOfBLayerSharedHits", m_numberOfBLayerSharedHits, "", m_defaultValue));
+ CHECK( addVariable("numberOfInnermostPixelLayerSharedHits", m_numberOfBLayerSharedHits, "", m_defaultValue));
CHECK( addVariable("numberOfPixelSharedHits", m_numberOfPixelSharedHits, "", m_defaultValue));
CHECK( addVariable("numberOfPixelHoles", m_numberOfPixelHoles, "", m_defaultValue));
CHECK( addVariable("numberOfSCTSharedHits", m_numberOfSCTSharedHits, "", m_defaultValue));
@@ -313,7 +313,7 @@ StatusCode TileMuonFillerTool::fill(const xAOD::Muon& p){
if(m_LevelOfDetails > 1){
- muonPointer->summaryValue( *((uint8_t*)m_numberOfBLayerHits), xAOD::numberOfBLayerHits );
+ muonPointer->summaryValue( *((uint8_t*)m_numberOfBLayerHits), xAOD::numberOfInnermostPixelLayerHits );
muonPointer->summaryValue( *((uint8_t*)m_numberOfPixelHits), xAOD::numberOfPixelHits );
muonPointer->summaryValue( *((uint8_t*)m_numberOfSCTHits), xAOD::numberOfSCTHits );
muonPointer->summaryValue( *((uint8_t*)m_numberOfTRTHits), xAOD::numberOfTRTHits );
@@ -321,7 +321,7 @@ StatusCode TileMuonFillerTool::fill(const xAOD::Muon& p){
muonPointer->summaryValue( *((uint8_t*)m_numberOfSCTDeadSensors), xAOD::numberOfSCTDeadSensors );
muonPointer->summaryValue( *((uint8_t*)m_numberOfSCTHoles), xAOD::numberOfSCTHoles );
muonPointer->summaryValue( *((uint8_t*)m_numberOfTRTHighThresholdHits), xAOD::numberOfTRTHighThresholdHits );
- muonPointer->summaryValue( *((uint8_t*)m_numberOfBLayerSharedHits), xAOD::numberOfBLayerSharedHits );
+ muonPointer->summaryValue( *((uint8_t*)m_numberOfBLayerSharedHits), xAOD::numberOfInnermostPixelLayerSharedHits );
muonPointer->summaryValue( *((uint8_t*)m_numberOfPixelSharedHits), xAOD::numberOfPixelSharedHits );
muonPointer->summaryValue( *((uint8_t*)m_numberOfPixelHoles), xAOD::numberOfPixelHoles );
muonPointer->summaryValue( *((uint8_t*)m_numberOfSCTSharedHits), xAOD::numberOfSCTSharedHits );
diff --git a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.cxx
index 6c0f70c2fc3..6dd03a08463 100644
--- a/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TileD3PDMaker/src/TileTrackFillerTool.cxx
@@ -121,9 +121,9 @@ StatusCode TileTrackFillerTool::book(){
}
if (m_LevelOfDetails > 3){
- CHECK( addVariable("numberOfBLayerHits", m_numberOfBLayerHits, "", m_defaultValue));
+ CHECK( addVariable("numberOfInnermostPixelLayerHits", m_numberOfBLayerHits, "", m_defaultValue));
CHECK( addVariable("numberOfTRTHighThresholdHits", m_numberOfTRTHighThresholdHits, "", m_defaultValue));
- CHECK( addVariable("numberOfBLayerSharedHits", m_numberOfBLayerSharedHits, "", m_defaultValue));
+ CHECK( addVariable("numberOfInnermostPixelLayerSharedHits", m_numberOfBLayerSharedHits, "", m_defaultValue));
CHECK( addVariable("numberOfPixelSharedHits", m_numberOfPixelSharedHits, "", m_defaultValue));
CHECK( addVariable("numberOfPixelHoles", m_numberOfPixelHoles, "", m_defaultValue));
CHECK( addVariable("numberOfSCTSharedHits", m_numberOfSCTSharedHits, "", m_defaultValue));
@@ -222,9 +222,9 @@ StatusCode TileTrackFillerTool::fill(const xAOD::TrackParticle& p){
} // IF
if(m_LevelOfDetails > 3){
- trackPointer->summaryValue( *((uint8_t*)m_numberOfBLayerHits), xAOD::numberOfBLayerHits );
+ trackPointer->summaryValue( *((uint8_t*)m_numberOfBLayerHits), xAOD::numberOfInnermostPixelLayerHits );
trackPointer->summaryValue( *((uint8_t*)m_numberOfTRTHighThresholdHits), xAOD::numberOfTRTHighThresholdHits );
- trackPointer->summaryValue( *((uint8_t*)m_numberOfBLayerSharedHits), xAOD::numberOfBLayerSharedHits );
+ trackPointer->summaryValue( *((uint8_t*)m_numberOfBLayerSharedHits), xAOD::numberOfInnermostPixelLayerSharedHits );
trackPointer->summaryValue( *((uint8_t*)m_numberOfPixelSharedHits), xAOD::numberOfPixelSharedHits );
trackPointer->summaryValue( *((uint8_t*)m_numberOfPixelHoles), xAOD::numberOfPixelHoles );
trackPointer->summaryValue( *((uint8_t*)m_numberOfSCTSharedHits), xAOD::numberOfSCTSharedHits );
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/xAODTrackSummaryFiller.py b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/xAODTrackSummaryFiller.py
index 270acb9f5b2..f72fd4e0968 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/xAODTrackSummaryFiller.py
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/python/xAODTrackSummaryFiller.py
@@ -78,7 +78,7 @@ sumvars = [
[ InfoPlus, 'standardDeviationOfChi2OS =standardDeviationOfChi2OS'],
# Expect BLayer hit
- [ ExpectBLayer, 'expectBLayerHit = expectInnermostPixelLayerHit'],
+ [ ExpectBLayer, 'expectInnermostPixelLayerHit = expectInnermostPixelLayerHit'],
# Muon hits
[ [MuonHits, HitSum], 'nprecisionLayers = numberOfPrecisionLayers'],
diff --git a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackTrackSummaryFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackTrackSummaryFillerTool.cxx
index ac4482edaa2..bd15ef7d3ab 100644
--- a/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackTrackSummaryFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/TrackD3PDMaker/src/TrackTrackSummaryFillerTool.cxx
@@ -55,7 +55,7 @@ struct Var {
Var vars[] = {
// ID hits
- { IDHitsMask, "nBLHits", Trk::numberOfBLayerHits },
+ { IDHitsMask, "nBLHits", Trk::numberOfInnermostPixelLayerHits },
{ IDHitsMask | HitSumMask, "nPixHits", Trk::numberOfPixelHits },
{ IDHitsMask | HitSumMask, "nSCTHits", Trk::numberOfSCTHits },
{ IDHitsMask | HitSumMask, "nTRTHits", Trk::numberOfTRTHits },
@@ -68,13 +68,13 @@ Var vars[] = {
{ IDHolesMask, "nPixelDeadSensors", Trk::numberOfPixelDeadSensors },
{ IDHolesMask, "nSCTDeadSensors", Trk::numberOfSCTDeadSensors },
// ID shared & Split hits
- { IDSharedHitsMask, "nBLSharedHits", Trk::numberOfBLayerSharedHits},
+ { IDSharedHitsMask, "nBLSharedHits", Trk::numberOfInnermostPixelLayerSharedHits},
{ IDSharedHitsMask, "nPixSharedHits", Trk::numberOfPixelSharedHits},
{ IDSharedHitsMask, "nSCTSharedHits", Trk::numberOfSCTSharedHits },
- { IDSharedHitsMask, "nBLayerSplitHits", Trk::numberOfBLayerSplitHits},
+ { IDSharedHitsMask, "nBLayerSplitHits", Trk::numberOfInnermostLayerSplitHits},
{ IDSharedHitsMask, "nPixSplitHits", Trk::numberOfPixelSplitHits},
// ID outliers
- { IDOutliersMask, "nBLayerOutliers", Trk::numberOfBLayerOutliers },
+ { IDOutliersMask, "nBLayerOutliers", Trk::numberOfInnermostPixelLayerOutliers },
{ IDOutliersMask, "nPixelOutliers", Trk::numberOfPixelOutliers },
{ IDOutliersMask, "nSCTOutliers", Trk::numberOfSCTOutliers },
{ IDOutliersMask, "nTRTOutliers", Trk::numberOfTRTOutliers},
@@ -94,7 +94,7 @@ Var vars[] = {
{ InfoPlusMask, "nOutliersOnTrack", Trk::numberOfOutliersOnTrack },
{ InfoPlusMask, "standardDeviationOfChi2OS", Trk::standardDeviationOfChi2OS },
// Expect BLayer hit
- { ExpectBLayerMask, "expectBLayerHit", Trk::expectBLayerHit },
+ { ExpectBLayerMask, "expectInnermostPixelLayerHit", Trk::expectInnermostPixelLayerHit },
// Muon hits
{ MuonHitsMask | HitSumMask, "nMDTHits", Trk::numberOfMdtHits },
{ MuonHitsMask | HitSumMask, "nCSCEtaHits", Trk::numberOfCscEtaHits },
diff --git a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/egammaConversionFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/egammaConversionFillerTool.cxx
index c4111c8ecd5..d4bdb6591d7 100644
--- a/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/egammaConversionFillerTool.cxx
+++ b/PhysicsAnalysis/D3PDMaker/egammaD3PDMaker/src/egammaConversionFillerTool.cxx
@@ -112,7 +112,7 @@ StatusCode egammaConversionFillerTool::fill (const xAOD::Photon& p)
if (tp1) {
psum += tp1->p4();
*m_pt1conv = tp1->pt();
- tp1->summaryValue (*m_convtrk1nBLHits, xAOD::numberOfBLayerHits);
+ tp1->summaryValue (*m_convtrk1nBLHits, xAOD::numberOfInnermostPixelLayerHits);
tp1->summaryValue (*m_convtrk1nPixHits, xAOD::numberOfPixelHits);
tp1->summaryValue (*m_convtrk1nSCTHits, xAOD::numberOfSCTHits);
tp1->summaryValue (*m_convtrk1nTRTHits, xAOD::numberOfTRTHits);
@@ -122,7 +122,7 @@ StatusCode egammaConversionFillerTool::fill (const xAOD::Photon& p)
if (tp2) {
psum += tp2->p4();
*m_pt2conv = tp2->pt();
- tp2->summaryValue (*m_convtrk2nBLHits, xAOD::numberOfBLayerHits);
+ tp2->summaryValue (*m_convtrk2nBLHits, xAOD::numberOfInnermostPixelLayerHits);
tp2->summaryValue (*m_convtrk2nPixHits, xAOD::numberOfPixelHits);
tp2->summaryValue (*m_convtrk2nSCTHits, xAOD::numberOfSCTHits);
tp2->summaryValue (*m_convtrk2nTRTHits, xAOD::numberOfTRTHits);
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ElectronsCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ElectronsCPContent.py
index 553b7f01663..a8ad3f2327c 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ElectronsCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/ElectronsCPContent.py
@@ -4,7 +4,7 @@ ElectronsCPContent = [
"Electrons",
"ElectronsAux.trackParticleLinks.pt.eta.phi.m.truthParticleLink.truthOrigin.truthType.caloClusterLinks.author.OQ.ethad1.ethad.f1.f3.f3core.e233.e237.e277.weta1.weta2.e2tsts1.fracs1.wtots1.emins1.emaxs1.etcone20.ptcone30.deltaEta1.deltaPhi2.deltaPhiRescaled2.Loose.Medium.Tight.DFCommonElectronsLHLoose.DFCommonElectronsLHMedium.DFCommonElectronsLHTight.DFCommonElectronsML.ptcone20.ptcone30.ptcone40.ptvarcone20.ptvarcone30.ptvarcone40.topoetcone20.topoetcone30.topoetcone40.charge.Reta.Rphi.Eratio.Rhad.Rhad1.DeltaE.DFCommonElectronsIsEMLoose.DFCommonElectronsIsEMMedium.DFCommonElectronsIsEMTight.topoetcone20ptCorrection.topoetcone30ptCorrection.topoetcone40ptCorrection.etcone20ptCorrection.etcone30ptCorrection.etcone40ptCorrection.LHLoose",
"GSFTrackParticles",
-"GSFTrackParticlesAux.phi.d0.theta.qOverP.definingParametersCovMatrix.parameterX.parameterPX.parameterPY.parameterPZ.parameterPosition.numberOfBLayerHits.numberOfBLayerOutliers.expectBLayerHit.numberOfPixelHits.numberOfPixelOutliers.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTOutliers.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers.numberOfTRTHighThresholdHits.numberOfTRTHighThresholdOutliers.numberOfTRTXenonHits.z0.vz.vertexLink.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers.numberOfNextToInnermostPixelLayerOutliers.expectInnermostPixelLayerHit.eProbabilityComb.truthParticleLink.originalTrackParticle.eProbabilityHT.numberOfNextToInnermostPixelLayerHits.expectNextToInnermostPixelLayerHit",
+"GSFTrackParticlesAux.phi.d0.theta.qOverP.definingParametersCovMatrix.parameterX.parameterPX.parameterPY.parameterPZ.parameterPosition.numberOfInnermostPixelLayerHits.numberOfInnermostPixelLayerOutliers.expectInnermostPixelLayerHit.numberOfPixelHits.numberOfPixelOutliers.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTOutliers.numberOfSCTDeadSensors.numberOfTRTHits.numberOfTRTOutliers.numberOfTRTHighThresholdHits.numberOfTRTHighThresholdOutliers.numberOfTRTXenonHits.z0.vz.vertexLink.numberOfNextToInnermostPixelLayerOutliers.eProbabilityComb.truthParticleLink.originalTrackParticle.eProbabilityHT.numberOfNextToInnermostPixelLayerHits.expectNextToInnermostPixelLayerHit",
"GSFConversionVertices",
"GSFConversionVerticesAux.px.py.pz",
"PrimaryVertices",
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/InDetTrackParticlesCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/InDetTrackParticlesCPContent.py
index 8b99065219f..1c480bc06c6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/InDetTrackParticlesCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/InDetTrackParticlesCPContent.py
@@ -2,5 +2,5 @@
InDetTrackParticlesCPContent = [
"InDetTrackParticles",
-"InDetTrackParticlesAux.phi.d0.z0.theta.qOverP.definingParametersCovMatrix.chiSquared.numberDoF.numberOfBLayerHits.numberOfPixelHits.numberOfPixelHoles.numberOfPixelSharedHits.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTSharedHits.numberOfSCTDeadSensors.vertexLink.numberOfInnermostPixelLayerHits.numberOfNextToInnermostPixelLayerHits.truthParticleLink.expectInnermostPixelLayerHit.expectNextToInnermostPixelLayerHit"
+"InDetTrackParticlesAux.phi.d0.z0.theta.qOverP.definingParametersCovMatrix.chiSquared.numberDoF.numberOfInnermostPixelLayerHits.numberOfPixelHits.numberOfPixelHoles.numberOfPixelSharedHits.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTSharedHits.numberOfSCTDeadSensors.vertexLink.numberOfNextToInnermostPixelLayerHits.truthParticleLink.expectInnermostPixelLayerHit.expectNextToInnermostPixelLayerHit"
]
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py
index 015b8dd8560..ecb463322a0 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetTrackParticlesCPContent.py
@@ -2,5 +2,5 @@
InDetTrackParticlesCPContent = [
"InDetTrackParticles",
-"InDetTrackParticlesAux.phi.theta.qOverP.chiSquared.numberDoF.numberOfBLayerHits.numberOfPixelHits.numberOfPixelHoles.numberOfPixelSharedHits.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTSharedHits.numberOfSCTDeadSensors"
+"InDetTrackParticlesAux.phi.theta.qOverP.chiSquared.numberDoF.numberOfInnermostPixelLayerHits.numberOfPixelHits.numberOfPixelHoles.numberOfPixelSharedHits.numberOfPixelDeadSensors.numberOfSCTHits.numberOfSCTHoles.numberOfSCTSharedHits.numberOfSCTDeadSensors"
]
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronMultiLeptonSelector.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronMultiLeptonSelector.cxx
index 30e37fde79c..7412ecc0158 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronMultiLeptonSelector.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronMultiLeptonSelector.cxx
@@ -163,7 +163,7 @@ const Root::TAccept& AsgElectronMultiLeptonSelector::accept( const xAOD::Electro
if (t) {
trackqoverp = t->qOverP();
- allFound = allFound && t->summaryValue(nBlayerHits, xAOD::numberOfBLayerHits);
+ allFound = allFound && t->summaryValue(nBlayerHits, xAOD::numberOfInnermostPixelLayerHits);
allFound = allFound && t->summaryValue(nPix, xAOD::numberOfPixelHits);
allFound = allFound && t->summaryValue(nSCT, xAOD::numberOfSCTHits);
allFound = allFound && t->summaryValue(nPixDeadSensors, xAOD::numberOfPixelDeadSensors);
@@ -174,7 +174,7 @@ const Root::TAccept& AsgElectronMultiLeptonSelector::accept( const xAOD::Electro
allFound = allFound && t->summaryValue(nTRT, xAOD::numberOfTRTHits);
allFound = allFound && t->summaryValue(nTRTOutliers, xAOD::numberOfTRTOutliers);
- allFound = allFound && t->summaryValue(expectBlayer, xAOD::expectBLayerHit);
+ allFound = allFound && t->summaryValue(expectBlayer, xAOD::expectInnermostPixelLayerHit);
nSi = nPix+nSCT;
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/BasicTrackGradeFactory.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/BasicTrackGradeFactory.cxx
index fb5c3a4ef30..94e197b6d0f 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/BasicTrackGradeFactory.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/BasicTrackGradeFactory.cxx
@@ -72,7 +72,7 @@ const TrackGradesDefinition & BasicTrackGradeFactory::getTrackGradesDefinition()
{
uint8_t nbs=0, nps=0, nss=0;
- if (!track.summaryValue(nbs, xAOD::numberOfBLayerSharedHits)){
+ if (!track.summaryValue(nbs, xAOD::numberOfInnermostPixelLayerSharedHits)){
ATH_MSG_ERROR("#BTAG# Cannot retrieve numberOfBLayerSharedHists for TrackGrade!");
}
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/DetailedTrackGradeFactory.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/DetailedTrackGradeFactory.cxx
index aa03017ff3c..232c9b0659b 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/DetailedTrackGradeFactory.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/DetailedTrackGradeFactory.cxx
@@ -216,8 +216,8 @@ TrackGrade* DetailedTrackGradeFactory::getGrade(const xAOD::TrackParticle & trac
//check if no hit in BLayer
if (!m_useRun2TrackGrading) {
uint8_t nbs;
- if (!track.summaryValue(nbs, xAOD::numberOfBLayerHits)){
- ATH_MSG_ERROR("#BTAG# Cannot retrieve numberOfBLayerHits for TrackGrade!");
+ if (!track.summaryValue(nbs, xAOD::numberOfInnermostPixelLayerHits)){
+ ATH_MSG_ERROR("#BTAG# Cannot retrieve numberOfInnermostPixelLayerHits for TrackGrade!");
}
if (nbs==0) nohitBLayer = true;
}
@@ -251,7 +251,7 @@ TrackGrade* DetailedTrackGradeFactory::getGrade(const xAOD::TrackParticle & trac
if (!m_useRun2TrackGrading){
//check if shared
uint8_t nbs=0, nps=0, nss=0;
- if (!track.summaryValue(nbs, xAOD::numberOfBLayerSharedHits)){
+ if (!track.summaryValue(nbs, xAOD::numberOfInnermostPixelLayerSharedHits)){
ATH_MSG_ERROR("#BTAG# Cannot retrieve numberOfBLayerSharedHists for TrackGrade!");
}
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/RNNIPTag.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/RNNIPTag.cxx
index 3710d7d04e3..04a56659f71 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/RNNIPTag.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/RNNIPTag.cxx
@@ -104,7 +104,7 @@ namespace trkvar {
const std::string N_SPLIT_PIX_HITS = "nsplitPixHits";
const std::string N_SCT_HITS = "nSCTHits";
const std::string N_SHARED_SCT_HITS = "nsharedSCTHits";
- const std::string EXPECT_BL_HIT = "expectBLayerHit";
+ const std::string EXPECT_BL_HIT = "expectInnermostPixelLayerHit";
const std::string EXPECT_INNERMOST_PIX_HIT =
"expectInnermostPixelLayerHit";
const std::string EXPECT_NEXT_TO_INNERMOST_PIX_HIT =
@@ -728,11 +728,11 @@ namespace {
out.at(N_NEXT_TO_INN_HITS).push_back(
val(tp, xAOD::numberOfNextToInnermostPixelLayerHits));
out.at(N_BL_HITS).push_back(
- val(tp, xAOD::numberOfBLayerHits));
+ val(tp, xAOD::numberOfInnermostPixelLayerHits));
out.at(N_SHARED_BL_HITS).push_back(
- val(tp, xAOD::numberOfBLayerSharedHits));
+ val(tp, xAOD::numberOfInnermostPixelLayerSharedHits));
out.at(N_SPLIT_BL_HITS).push_back(
- val(tp, xAOD::numberOfBLayerSplitHits));
+ val(tp, xAOD::numberOfInnermostPixelLayerSplitHits));
out.at(N_PIX_HITS).push_back(
val(tp, xAOD::numberOfPixelHits));
out.at(N_SHARED_PIX_HITS).push_back(
@@ -744,7 +744,7 @@ namespace {
out.at(N_SHARED_SCT_HITS).push_back(
val(tp, xAOD::numberOfSCTSharedHits));
out.at(EXPECT_BL_HIT).push_back(
- val(tp, xAOD::expectBLayerHit));
+ val(tp, xAOD::expectInnermostPixelLayerHit));
out.at(EXPECT_INNERMOST_PIX_HIT).push_back(
val(tp, xAOD::expectInnermostPixelLayerHit));
out.at(EXPECT_NEXT_TO_INNERMOST_PIX_HIT).push_back(
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/SharedHitMapper.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/SharedHitMapper.cxx
index b0fe25aad9e..101c4a4b312 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/SharedHitMapper.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/SharedHitMapper.cxx
@@ -134,7 +134,7 @@ StatusCode SharedHitMapper::execute() {
xAOD::TrackParticleContainer::const_iterator trkE(inputTracks->end());
for (; trk1I!=trkE; ++trk1I) {
int nbs, nps, nss;
- (*trk1I)->summaryValue(nbs, xAOD::numberOfBLayerSharedHits);
+ (*trk1I)->summaryValue(nbs, xAOD::numberOfInnermostPixelLayerSharedHits);
(*trk1I)->summaryValue(nps, xAOD::numberOfPixelSharedHits);
(*trk1I)->summaryValue(nss, xAOD::numberOfSCTSharedHits);
if (nbs < 0) nbs = 0;
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx
index ab1b0f28875..608cc2c647f 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx
@@ -233,7 +233,7 @@ namespace Analysis {
}
if(m_useTrackSummaryInfo) {
uint8_t nb=0;
- track->summaryValue(nb, xAOD::numberOfBLayerHits);
+ track->summaryValue(nb, xAOD::numberOfInnermostPixelLayerHits);
if(nb < m_nHitBLayer) {
failedCuts.set(nHitBLayer);
if(!m_useBLayerHitPrediction) {
@@ -241,8 +241,8 @@ namespace Analysis {
failedCuts.set(deadBLayer);
} else {
uint8_t ehib=1;
- if (!track->summaryValue(ehib,xAOD::expectBLayerHit)) {
- ATH_MSG_WARNING("#BTAG# expectBLayerHit not computed in TrackSummary: assuming true");
+ if (!track->summaryValue(ehib,xAOD::expectInnermostPixelLayerHit)) {
+ ATH_MSG_WARNING("#BTAG# expectInnermostPixelLayerHit not computed in TrackSummary: assuming true");
ehib=1;
}
if(ehib) { // check if module was alive
diff --git a/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx b/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
index 36b48b4ac0a..e12c14a64dd 100644
--- a/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
+++ b/PhysicsAnalysis/MuonID/MuonTagTools/src/MuonTagTool.cxx
@@ -631,13 +631,13 @@ StatusCode MuonTagTool::execute(TagFragmentCollection & muonTagCol, const int ma
uint8_t nblh = 0x0;
uint8_t eblh = 0x0;
uint8_t nblo = 0x0;
- if( !tp->summaryValue(nblh,xAOD::numberOfBLayerHits)){
+ if( !tp->summaryValue(nblh,xAOD::numberOfInnermostPixelLayerHits)){
ATH_MSG_WARNING("No nBLayerHits");
}
- if( !tp->summaryValue(nblo,xAOD::numberOfBLayerOutliers)){
+ if( !tp->summaryValue(nblo,xAOD::numberOfInnermostPixelLayerOutliers)){
ATH_MSG_WARNING("No nofBLayerOutliers");
}
- if( !tp->summaryValue(eblh,xAOD::expectBLayerHit) ||
+ if( !tp->summaryValue(eblh,xAOD::expectInnermostPixelLayerHit) ||
(nblh + nblo > 0) ) tightness = tightness | bit2int(11);
// pixel hit counts
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx b/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx
index 992ef74143a..5d0628d2ef3 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx
+++ b/PhysicsAnalysis/PrimaryDPDMaker/src/ThinContainers.cxx
@@ -1789,7 +1789,7 @@ StatusCode ThinContainers::findGoodTrackParticles(const Rec::TrackParticleContai
const Trk::TrackSummary* trackSum = track->trackSummary();
long int nPixelHits = (long int) trackSum->get(Trk::numberOfPixelHits);
long int nSctHits = (long int) trackSum->get(Trk::numberOfSCTHits);
- long int nBLayHits = (long int) trackSum->get(Trk::numberOfBLayerHits);
+ long int nBLayHits = (long int) trackSum->get(Trk::numberOfInnermostPixelLayerHits);
if ( nPixelHits < 0 ) nPixelHits = 0;
if ( nSctHits < 0 ) nSctHits = 0;
if ( nBLayHits < 0 ) nBLayHits = 0;
@@ -1901,7 +1901,7 @@ StatusCode ThinContainers::findGoodTracks(const TrackCollection* trackCont,
nPixelHits = (long int) trackSum->get(Trk::numberOfPixelHits);
nSctHits = (long int) trackSum->get(Trk::numberOfSCTHits);
- nBLayHits = (long int) trackSum->get(Trk::numberOfBLayerHits);
+ nBLayHits = (long int) trackSum->get(Trk::numberOfInnermostPixelLayerHits);
}
if ( nPixelHits < 0 ) nPixelHits = 0;
diff --git a/PhysicsAnalysis/RingerSelectorTools/Root/tools/TrackPatternsHolder.cxx b/PhysicsAnalysis/RingerSelectorTools/Root/tools/TrackPatternsHolder.cxx
index 667ce5ba25a..338e4d921f0 100644
--- a/PhysicsAnalysis/RingerSelectorTools/Root/tools/TrackPatternsHolder.cxx
+++ b/PhysicsAnalysis/RingerSelectorTools/Root/tools/TrackPatternsHolder.cxx
@@ -97,9 +97,9 @@ void TrackPatternsHolder::extractPatternsFrom(
bool allFound = true;
- allFound = allFound && track->summaryValue(m_nBL, xAOD::numberOfBLayerHits);
+ allFound = allFound && track->summaryValue(m_nBL, xAOD::numberOfInnermostPixelLayerHits);
if (m_useBLOutliers) {
- allFound = allFound && track->summaryValue(m_nBLOutliers, xAOD::numberOfBLayerOutliers);
+ allFound = allFound && track->summaryValue(m_nBLOutliers, xAOD::numberOfInnermostPixelLayerOutliers);
}
allFound = allFound && track->summaryValue(m_nPi, xAOD::numberOfPixelHits);
if (m_usePIXOutliers){
@@ -118,7 +118,7 @@ void TrackPatternsHolder::extractPatternsFrom(
if (m_useTRTXenonHits){
allFound = allFound && track->summaryValue(m_nTRTXenonHits, xAOD::numberOfTRTXenonHits);
}
- allFound = allFound && track->summaryValue(m_expectHitInBLayer, xAOD::expectBLayerHit);
+ allFound = allFound && track->summaryValue(m_expectHitInBLayer, xAOD::expectInnermostPixelLayerHit);
m_trackd0 = fabsf(track->d0());
diff --git a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDESDM_SmpCaloId.py b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDESDM_SmpCaloId.py
index ec61f98ece6..d3fe39470f6 100644
--- a/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDESDM_SmpCaloId.py
+++ b/PhysicsAnalysis/SUSYPhys/LongLivedParticleDPDMaker/share/PhysDESDM_SmpCaloId.py
@@ -80,7 +80,7 @@ offlineObjectFilterNames=[]
#=#cutString+= str(primRPVLLDESDM.SmpCaloId_trackParticleFilterFlags.cutPtMin)
#=#cutString+= " && "
#=#cutString+= primRPVLLDESDM.SmpCaloId_trackParticleFilterFlags.cutInputCollection
-#=#cutString+=".numberOfBLayerHits >="
+#=#cutString+=".numberOfInnermostPixelLayerHits >="
#=#cutString+=str(primRPVLLDESDM.SmpCaloId_trackParticleFilterFlags.cutBLayerHitsMin)
#=#cutString+=" ) >= 1 "
#=#print "NICK SmpCaloId cutString is ",cutString
diff --git a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/ReconElectronsPlots.cxx b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/ReconElectronsPlots.cxx
index ce05170379d..251f313f77f 100644
--- a/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/ReconElectronsPlots.cxx
+++ b/PhysicsAnalysis/StandardModelPhys/Validation/ZeeValidation/src/ReconElectronsPlots.cxx
@@ -277,8 +277,8 @@ namespace ZeeValidation{
void ReconElectronsPlots::fillHitInfo(const xAOD::Electron* electron){
uint8_t blayerh(0), pixelh(0), scth(0), trth(0), trthighh(0), blayero(0), pixelo(0), scto(0), trto(0), trthigho(0);
- if( electron -> trackParticleSummaryValue(blayerh, xAOD::numberOfBLayerHits ) &&
- electron -> trackParticleSummaryValue(blayero, xAOD::numberOfBLayerOutliers) ){
+ if( electron -> trackParticleSummaryValue(blayerh, xAOD::numberOfInnermostPixelLayerHits ) &&
+ electron -> trackParticleSummaryValue(blayero, xAOD::numberOfInnermostPixelLayerOutliers) ){
h_n_blayer_hits -> Fill(blayerh);
h_n_blayer_hits_outliers -> Fill(blayerh + blayero);
}
diff --git a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/InDetCandidateTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/InDetCandidateTool.cxx
index a10092e98a7..c749810cc16 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/InDetCandidateTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedBaseTools/src/InDetCandidateTool.cxx
@@ -65,7 +65,7 @@ namespace MuonCombined {
if( !m_trackSelector->decision(*tp) ) {
if( msgLvl(MSG::VERBOSE) && tp->pt() > 5000. )
ATH_MSG_DEBUG(" Discarding InDet TrackParticle: pt " << tp->pt() << " eta " << tp->eta() << " phi " << tp->phi()
- << " Pixel " << getCount(*tp,xAOD::numberOfBLayerHits ) + getCount(*tp,xAOD::numberOfPixelHits )
+ << " Pixel " << getCount(*tp,xAOD::numberOfInnermostPixelLayerHits ) + getCount(*tp,xAOD::numberOfPixelHits )
<< " SCT " << getCount(*tp,xAOD::numberOfSCTHits ) << " TRT " << getCount(*tp, xAOD::numberOfTRTHits ) );
continue;
}
@@ -82,7 +82,7 @@ namespace MuonCombined {
link.toPersistent();
ATH_MSG_DEBUG(" Creating InDetCandidate: pt " << tp->pt() << " eta " << tp->eta() << " phi " << tp->phi()
- << " Pixel " << getCount(*tp,xAOD::numberOfBLayerHits ) + getCount(*tp,xAOD::numberOfPixelHits )
+ << " Pixel " << getCount(*tp,xAOD::numberOfInnermostPixelLayerHits ) + getCount(*tp,xAOD::numberOfPixelHits )
<< " SCT " << getCount(*tp,xAOD::numberOfSCTHits ) << " TRT " << getCount(*tp, xAOD::numberOfTRTHits ) );
if( msgLvl(MSG::VERBOSE) && tp->isAvailable<ElementLink< xAOD::TruthParticleContainer > >("truthParticleLink") ){
ElementLink< xAOD::TruthParticleContainer > truthLink = tp->auxdata<ElementLink< xAOD::TruthParticleContainer > >("truthParticleLink");
diff --git a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
index abf14ea23be..799531af2f9 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedEvaluationTools/src/MuonPrintingTool.cxx
@@ -230,17 +230,17 @@ std::string Rec::MuonPrintingTool::print( const xAOD::Muon& muon ) const {
sout << " No Track link";
ATH_MSG_DEBUG("ID track particle without Trk::Track");
}else{
- // uint8_t numberOfBLayerHits=0;
+ // uint8_t numberOfInnermostPixelLayerHits=0;
// uint8_t numberOfPixelHits=0;
// uint8_t numberOfSCTHits=0;
// uint8_t numberOfTRTHits=0;
- // if( !muon.summaryValue(numberOfBLayerHits,xAOD::numberOfBLayerHits) ) numberOfBLayerHits = 0;
+ // if( !muon.summaryValue(numberOfInnermostPixelLayerHits,xAOD::numberOfInnermostPixelLayerHits) ) numberOfInnermostPixelLayerHits = 0;
// if( !muon.summaryValue(numberOfPixelHits,xAOD::numberOfPixelHits) ) numberOfPixelHits = 0;
// if( !muon.summaryValue(numberOfSCTHits,xAOD::numberOfSCTHits) ) numberOfSCTHits = 0;
// if( !muon.summaryValue(numberOfTRTHits,xAOD::numberOfTRTHits) ) numberOfTRTHits = 0;
- // sout << " Hits in B Layer " << static_cast<int>(numberOfBLayerHits)
+ // sout << " Hits in B Layer " << static_cast<int>(numberOfInnermostPixelLayerHits)
// << " Pixels " << static_cast<int>(numberOfPixelHits)
// << " SCT " << static_cast<int>(numberOfSCTHits)
// << " TRT " << static_cast<int>(numberOfTRTHits);
diff --git a/Reconstruction/MuonIdentification/muonEvent/muonEvent/Muon.h b/Reconstruction/MuonIdentification/muonEvent/muonEvent/Muon.h
index b1bc555b094..6a5fafe63d8 100644
--- a/Reconstruction/MuonIdentification/muonEvent/muonEvent/Muon.h
+++ b/Reconstruction/MuonIdentification/muonEvent/muonEvent/Muon.h
@@ -368,7 +368,7 @@ class Muon : public ParticleImpl<
const CaloCluster* cluster() const { return ((this->hasCluster()) ? *m_cluster : 0); }
/** Get Inner detector Hits information from ID trackparticle */
- int numberOfBLayerHits() const;
+ int numberOfInnermostPixelLayerHits() const;
/** Get number of Pixel hits from ID trackparticle */
int numberOfPixelHits() const;
/** Get number of Silicon SCT hits from ID trackparticle */
@@ -378,7 +378,7 @@ class Muon : public ParticleImpl<
/** Get number of TRT High Threshold hits from ID trackparticle */
int numberOfTRTHighThresholdHits() const;
/** Get number of shared hits or holes from ID trackparticle */
- int numberOfBLayerSharedHits() const;
+ int numberOfInnermostPixelLayerSharedHits() const;
/** Get number of Pixel shared hits from ID trackparticle */
int numberOfPixelSharedHits() const;
/** Get number of Pixel holes from ID trackparticle */
diff --git a/Reconstruction/MuonIdentification/muonEvent/src/Muon.cxx b/Reconstruction/MuonIdentification/muonEvent/src/Muon.cxx
index c4173fec7a8..4ca0ec622e9 100644
--- a/Reconstruction/MuonIdentification/muonEvent/src/Muon.cxx
+++ b/Reconstruction/MuonIdentification/muonEvent/src/Muon.cxx
@@ -547,9 +547,9 @@ std::pair<double,double> Muon::energyLoss() const{
}
/** number of B-layer hits */
-int Muon::numberOfBLayerHits() const {
+int Muon::numberOfInnermostPixelLayerHits() const {
if ( this->hasCombinedMuonTrackParticle() || this->hasInDetTrackParticle() )
- return (*m_inDetTrackParticle)->trackSummary()->get( Trk::numberOfBLayerHits );
+ return (*m_inDetTrackParticle)->trackSummary()->get( Trk::numberOfInnermostPixelLayerHits );
else return -1;
}
@@ -587,9 +587,9 @@ int Muon::numberOfTRTHighThresholdHits() const {
}
/** number of shared hits at pixel b-layer */
-int Muon::numberOfBLayerSharedHits() const {
+int Muon::numberOfInnermostPixelLayerSharedHits() const {
if ( this->hasCombinedMuonTrackParticle() || this->hasInDetTrackParticle() )
- return (*m_inDetTrackParticle)->trackSummary()->get( Trk::numberOfBLayerSharedHits );
+ return (*m_inDetTrackParticle)->trackSummary()->get( Trk::numberOfInnermostPixelLayerSharedHits );
else return -1;
}
int Muon::numberOfPixelSharedHits() const {
diff --git a/Reconstruction/egamma/egammaPerformance/src/ZeeTaPMonTool.cxx b/Reconstruction/egamma/egammaPerformance/src/ZeeTaPMonTool.cxx
index 2da773a2f2a..010047a5e74 100755
--- a/Reconstruction/egamma/egammaPerformance/src/ZeeTaPMonTool.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/ZeeTaPMonTool.cxx
@@ -412,15 +412,15 @@ void ZeeTaPMonTool::fillElectronProbe(const xAOD::Electron *el, bool isTight, bo
// Associated track details
const xAOD::TrackParticle *t = el->trackParticle();
double trackp = 0;
- unsigned char numberOfBLayerHits=-1;
+ unsigned char numberOfInnermostPixelLayerHits=-1;
unsigned char numberOfPixelHits=-1;
unsigned char numberOfSCTHits=-1;
unsigned char numberOfTRTHits=-1;
if(t) {
trackp = t->pt()*cosh(t->eta());
// retrieve track summary information
- if( t->summaryValue(numberOfBLayerHits,xAOD::numberOfBLayerHits) ) {
- fillTH1FperRegion(m_hvNOfBLayerHits,ir,numberOfBLayerHits);
+ if( t->summaryValue(numberOfInnermostPixelLayerHits,xAOD::numberOfInnermostPixelLayerHits) ) {
+ fillTH1FperRegion(m_hvNOfBLayerHits,ir,numberOfInnermostPixelLayerHits);
}
if( t->summaryValue(numberOfPixelHits,xAOD::numberOfPixelHits) && t->summaryValue(numberOfSCTHits,xAOD::numberOfSCTHits) ) {
fillTH1FperRegion(m_hvNOfSiHits,ir,numberOfPixelHits+numberOfSCTHits);
diff --git a/Reconstruction/egamma/egammaPerformance/src/electronMonTool.cxx b/Reconstruction/egamma/egammaPerformance/src/electronMonTool.cxx
index c2c115b4384..014eac816b1 100755
--- a/Reconstruction/egamma/egammaPerformance/src/electronMonTool.cxx
+++ b/Reconstruction/egamma/egammaPerformance/src/electronMonTool.cxx
@@ -462,7 +462,7 @@ StatusCode electronMonTool::fillHistogramsForOneElectron(xAOD::ElectronContainer
// Associated track details
const xAOD::TrackParticle *t = (*e_iter)->trackParticle();
double trackp = 0;
- unsigned char numberOfBLayerHits=-1;
+ unsigned char numberOfInnermostPixelLayerHits=-1;
unsigned char numberOfPixelHits=-1;
unsigned char numberOfSCTHits=-1;
unsigned char numberOfTRTHits=-1;
@@ -471,8 +471,8 @@ StatusCode electronMonTool::fillHistogramsForOneElectron(xAOD::ElectronContainer
if(t) {
trackp = t->pt()*cosh(t->eta());
// retrieve track summary information
- if( t->summaryValue(numberOfBLayerHits,xAOD::numberOfBLayerHits) ) {
- fillTH1FperRegion(myHist.m_hvNOfBLayerHits,ir,numberOfBLayerHits);
+ if( t->summaryValue(numberOfInnermostPixelLayerHits,xAOD::numberOfInnermostPixelLayerHits) ) {
+ fillTH1FperRegion(myHist.m_hvNOfBLayerHits,ir,numberOfInnermostPixelLayerHits);
}
if( t->summaryValue(numberOfPixelHits,xAOD::numberOfPixelHits) && t->summaryValue(numberOfSCTHits,xAOD::numberOfSCTHits) ) {
fillTH1FperRegion(myHist.m_hvNOfSiHits,ir,numberOfPixelHits+numberOfSCTHits);
diff --git a/Reconstruction/tauRecTools/src/TauConversionTagger.cxx b/Reconstruction/tauRecTools/src/TauConversionTagger.cxx
index 0e9a7852a47..c5066cc86ad 100644
--- a/Reconstruction/tauRecTools/src/TauConversionTagger.cxx
+++ b/Reconstruction/tauRecTools/src/TauConversionTagger.cxx
@@ -98,7 +98,7 @@ StatusCode TauConversionTagger::execute(xAOD::TauJet& pTau) {
// Note: all must be of type uint8_t for summaryValue filling to work in xAOD
// TODO: check if these default values are sane
uint8_t nBLHits = 0;
- uint8_t expectBLayerHit = 0;
+ uint8_t expectInnermostPixelLayerHit = 0;
uint8_t nTRTHighTHits = 0;
uint8_t nTRTHighTOutliers = 0;
float nTRTHighT_outl = 0.;
@@ -107,8 +107,8 @@ StatusCode TauConversionTagger::execute(xAOD::TauJet& pTau) {
uint8_t nTRTOutliers = 0;
// Fill TrackSummary info
- TauJetTrack->summaryValue(nBLHits,xAOD::numberOfBLayerHits);
- TauJetTrack->summaryValue(expectBLayerHit,xAOD::expectBLayerHit);
+ TauJetTrack->summaryValue(nBLHits,xAOD::numberOfInnermostPixelLayerHits);
+ TauJetTrack->summaryValue(expectInnermostPixelLayerHit,xAOD::expectInnermostPixelLayerHit);
TauJetTrack->summaryValue(nTRTHighTHits,xAOD::numberOfTRTHighThresholdHits);
TauJetTrack->summaryValue(nTRTHighTOutliers,xAOD::numberOfTRTHighThresholdOutliers);
nTRTHighT_outl = nTRTHighTHits + nTRTHighTOutliers;
@@ -141,7 +141,7 @@ StatusCode TauConversionTagger::execute(xAOD::TauJet& pTau) {
m_a_cut[0][0]=0.0003; m_b_cut[0][0]=0.1725;
m_a_cut[0][1]=0.0003; m_b_cut[0][1]=0.2025;
- if ( nBLHits==0 && expectBLayerHit ){
+ if ( nBLHits==0 && expectInnermostPixelLayerHit ){
if( m_TRTHighTOutliersRatio > -m_a_cut[0][0]*Rconv + m_b_cut[0][0] && (-rconvii) > 40 && pt < 20000 ) m_TrkIsConv=true;
}
else {
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx
index 6fa5c4b9cb8..74d62d3588d 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasRecoTools/src/ISF_TrackSummaryHelperTool.cxx
@@ -95,7 +95,7 @@ void iFatras::ISF_TrackSummaryHelperTool::analyse(const Trk::Track& track,
information[Trk::numberOfPixelOutliers]++;
if (m_pixelId->is_blayer(id)){
- information[Trk::numberOfBLayerOutliers]++;
+ information[Trk::numberOfInnermostPixelLayerOutliers]++;
}
if (m_pixelId->layer_disk(id)==0 && m_pixelId->is_barrel(id)){
information[Trk::numberOfInnermostPixelLayerOutliers]++;
@@ -108,7 +108,7 @@ void iFatras::ISF_TrackSummaryHelperTool::analyse(const Trk::Track& track,
if (msgLvl(MSG::DEBUG)) msg() << "Pixel info storing" << endmsg;
information[Trk::numberOfPixelHits]++;
- if ((m_pixelId->is_blayer(id))) information[Trk::numberOfBLayerHits]++; // found b layer hit
+ if ((m_pixelId->is_blayer(id))) information[Trk::numberOfInnermostPixelLayerHits]++; // found b layer hit
if (m_pixelId->layer_disk(id)==0 && m_pixelId->is_barrel(id)) information[Trk::numberOfInnermostPixelLayerHits]++;
if (m_pixelId->layer_disk(id)==1 && m_pixelId->is_barrel(id)) information[Trk::numberOfNextToInnermostPixelLayerHits]++;
diff --git a/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx b/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx
index 4be154a42e6..f8373470f37 100644
--- a/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx
+++ b/Tracking/TrkEventCnv/TrkJiveXML/src/TrackRetriever.cxx
@@ -572,7 +572,7 @@ namespace JiveXML {
nSCTHits.push_back(DataType(0));
nTRTHits.push_back(DataType(0));
}else{
- nBLayerHits.push_back(DataType(summary->get(Trk::numberOfBLayerHits)));
+ nBLayerHits.push_back(DataType(summary->get(Trk::numberOfInnermostPixelLayerHits)));
nPixHits.push_back(DataType(summary->get(Trk::numberOfPixelHits)));
nSCTHits.push_back(DataType(summary->get(Trk::numberOfSCTHits)));
nTRTHits.push_back(DataType(summary->get(Trk::numberOfTRTHits)));
diff --git a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx
index d516323c3db..18cf1bee0f6 100644
--- a/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx
+++ b/Tracking/TrkTools/TrkAmbiguityProcessor/src/TrackScoringTool.cxx
@@ -31,8 +31,8 @@ Trk::TrackScoringTool::TrackScoringTool(const std::string& t,
m_summaryTypeScore[Trk::numberOfPixelSharedHits] = -10; // a shared hit is only half the weight
m_summaryTypeScore[Trk::numberOfPixelHoles] = -10; // a hole is bad
- m_summaryTypeScore[Trk::numberOfBLayerHits] = 10; // addition for being b-layer
- m_summaryTypeScore[Trk::numberOfBLayerSharedHits] = -5; // a shared hit is only half the weight
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerHits] = 10; // addition for being b-layer
+ m_summaryTypeScore[Trk::numberOfInnermostPixelLayerSharedHits] = -5; // a shared hit is only half the weight
m_summaryTypeScore[Trk::numberOfGangedPixels] = -5; // decrease for being ganged
diff --git a/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx b/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx
index 82874f3a979..70879faa2ac 100755
--- a/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx
+++ b/Tracking/TrkTools/TrkTrackSummaryTool/src/TrackSummaryTool.cxx
@@ -212,8 +212,6 @@ Trk::TrackSummaryTool::createSummary( const Track& track,
if (m_pixelExists)
{
information [numberOfContribPixelLayers] = 0;
- information [numberOfBLayerHits] = 0;
- information [numberOfBLayerOutliers] = 0;
information [numberOfInnermostPixelLayerHits] = 0;
information [numberOfInnermostPixelLayerOutliers] = 0;
information [numberOfNextToInnermostPixelLayerHits] = 0;
@@ -225,7 +223,6 @@ Trk::TrackSummaryTool::createSummary( const Track& track,
information [numberOfPixelSpoiltHits] = 0;
information [numberOfGangedFlaggedFakes] = 0;
information [numberOfPixelSplitHits] = 0;
- information [numberOfBLayerSplitHits] = 0;
information [numberOfInnermostLayerSplitHits] = 0;
information [numberOfNextToInnermostLayerSplitHits] = 0;
if (track.info().trackFitter() != TrackInfo::Unknown && !m_dedxtool.empty()) {
@@ -254,7 +251,6 @@ Trk::TrackSummaryTool::createSummary( const Track& track,
if (m_doSharedHits) {
information [numberOfSCTSharedHits] = 0;
if (m_pixelExists) {
- information [numberOfBLayerSharedHits] = 0;
information [numberOfInnermostPixelLayerSharedHits] = 0;
information [numberOfNextToInnermostPixelLayerSharedHits] = 0;
information [numberOfPixelSharedHits] = 0;
diff --git a/Tracking/TrkValidation/TrkValHistUtils/Root/IDHitPlots.cxx b/Tracking/TrkValidation/TrkValHistUtils/Root/IDHitPlots.cxx
index 894b9e2c53c..1a8433b3723 100644
--- a/Tracking/TrkValidation/TrkValHistUtils/Root/IDHitPlots.cxx
+++ b/Tracking/TrkValidation/TrkValHistUtils/Root/IDHitPlots.cxx
@@ -87,7 +87,7 @@ namespace Trk {
uint8_t iBLayerHits(0), iPixHits(0), iSctHits(0), iTrtHits(0);
uint8_t iPixHoles(0), iSCTHoles(0), iTrtHTHits(0);
- if (trk.summaryValue(iBLayerHits, xAOD::numberOfBLayerHits)) {
+ if (trk.summaryValue(iBLayerHits, xAOD::numberOfInnermostPixelLayerHits)) {
nBLayerHits->Fill(iBLayerHits);
}
if (trk.summaryValue(iPixHits, xAOD::numberOfPixelHits)) {
@@ -116,13 +116,13 @@ namespace Trk {
iPixelGangedFakes(0);
uint8_t iSCTOutliers(0), iSCTDoubleHoles(0), iSCTShared(0);
uint8_t iTRTOutliers(0), iTRTHTOutliers(0);
- if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfBLayerOutliers)) {
+ if (trk.summaryValue(iBLayerOutliers, xAOD::numberOfInnermostPixelLayerOutliers)) {
nBLayerOutliers->Fill(iBLayerOutliers);
}
- if (trk.summaryValue(iBLayerShared, xAOD::numberOfBLayerSharedHits)) {
+ if (trk.summaryValue(iBLayerShared, xAOD::numberOfInnermostPixelLayerSharedHits)) {
nBLayerSharedHits->Fill(iBLayerShared);
}
- if (trk.summaryValue(iBLayerSplit, xAOD::numberOfBLayerSplitHits)) {
+ if (trk.summaryValue(iBLayerSplit, xAOD::numberOfInnermostPixelLayerSplitHits)) {
nBLayerSplitHits->Fill(iBLayerSplit);
}
if (trk.summaryValue(iPixelOutliers, xAOD::numberOfPixelOutliers)) {
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
index ab004f700c9..f2a009dc5e6 100755
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/src/TrigEgammaRec.cxx
@@ -204,7 +204,7 @@ TrigEgammaRec::TrigEgammaRec(const std::string& name,ISvcLocator* pSvcLocator):
//Track-related monitoring accesible from xAOD::Electron
declareMonitoredCollection("nBLayerHits", *my_pp_cast <xAODElectronDV_type>(&m_electron_container), &getTrackSummary_numberOfInnermostPixelLayerHits);
- declareMonitoredCollection("expectBLayerHit", *my_pp_cast <xAODElectronDV_type>(&m_electron_container), &getTrackSummary_expectInnermostPixelLayerHit);
+ declareMonitoredCollection("expectInnermostPixelLayerHit", *my_pp_cast <xAODElectronDV_type>(&m_electron_container), &getTrackSummary_expectInnermostPixelLayerHit);
declareMonitoredCollection("nPixelHits", *my_pp_cast <xAODElectronDV_type>(&m_electron_container), &getTrackSummary_numberOfPixelHits);
declareMonitoredCollection("nSCTHits", *my_pp_cast <xAODElectronDV_type>(&m_electron_container), &getTrackSummary_numberOfSCTHits);
declareMonitoredCollection("nBLayerOutliers", *my_pp_cast <xAODElectronDV_type>(&m_electron_container), &getTrackSummary_numberOfInnermostPixelLayerOutliers);
diff --git a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx
index ebd496289ed..3449556b336 100755
--- a/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx
+++ b/Trigger/TrigAlgorithms/TrigT2HistoPrmVtx/src/TrigT2HistoPrmVtxBase.cxx
@@ -283,9 +283,9 @@ bool TrigT2HistoPrmVtxBase::efTrackSel(const xAOD::TrackParticle*& track, unsign
uint8_t nSCT = 0;
uint8_t expBL = 0;
- track->summaryValue(expBL, xAOD::expectBLayerHit);
+ track->summaryValue(expBL, xAOD::expectInnermostPixelLayerHit);
- track->summaryValue(nBlay, xAOD::numberOfBLayerHits);
+ track->summaryValue(nBlay, xAOD::numberOfInnermostPixelLayerHits);
track->summaryValue(nPix, xAOD::numberOfPixelHits);
track->summaryValue(nSCT, xAOD::numberOfSCTHits);
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx
index f8d357aac02..b8bdf691fcd 100755
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavNtuple.cxx
@@ -568,8 +568,8 @@ bool TrigEgammaNavNtuple::fillElectron( const xAOD::Electron *el ){
m_el_charge = el->charge();
track->summaryValue( m_el_eprobht , xAOD::SummaryType::eProbabilityHT );
- track->summaryValue( m_el_nblayerhits , xAOD::SummaryType::numberOfBLayerHits );
- track->summaryValue( m_el_nblayerolhits , xAOD::SummaryType::numberOfBLayerOutliers );
+ track->summaryValue( m_el_nblayerhits , xAOD::SummaryType::numberOfInnermostPixelLayerHits );
+ track->summaryValue( m_el_nblayerolhits , xAOD::SummaryType::numberOfInnermostPixelLayerOutliers );
track->summaryValue( m_el_npixhits , xAOD::SummaryType::numberOfPixelHits );
track->summaryValue( m_el_npixolhits , xAOD::SummaryType::numberOfPixelOutliers );
track->summaryValue( m_el_nscthits , xAOD::SummaryType::numberOfSCTHits );
@@ -579,7 +579,7 @@ bool TrigEgammaNavNtuple::fillElectron( const xAOD::Electron *el ){
track->summaryValue( m_el_ntrthighthresolhits, xAOD::SummaryType::numberOfTRTHighThresholdOutliers );
track->summaryValue( m_el_ntrtolhits , xAOD::SummaryType::numberOfTRTOutliers );
track->summaryValue( m_el_ntrtxenonhits , xAOD::SummaryType::numberOfTRTXenonHits );
- //track->summaryValue( m_el_expectblayerhit , xAOD::SummaryType::expectBLayerHit );
+ //track->summaryValue( m_el_expectblayerhit , xAOD::SummaryType::expectInnermostPixelLayerHit );
track->summaryValue( m_el_npixdeadsensors , xAOD::SummaryType::numberOfPixelDeadSensors);
track->summaryValue( m_el_nsctdeadsensors , xAOD::SummaryType::numberOfSCTDeadSensors);
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx
index 2f0981a9ac1..62484f0cc05 100755
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/Root/TrigEgammaNavTPNtuple.cxx
@@ -494,8 +494,8 @@ bool TrigEgammaNavTPNtuple::fillElectron( const xAOD::Electron *el ){
m_el_charge = el->charge();
track->summaryValue( m_el_eprobht , xAOD::SummaryType::eProbabilityHT );
- track->summaryValue( m_el_nblayerhits , xAOD::SummaryType::numberOfBLayerHits );
- track->summaryValue( m_el_nblayerolhits , xAOD::SummaryType::numberOfBLayerOutliers );
+ track->summaryValue( m_el_nblayerhits , xAOD::SummaryType::numberOfInnermostPixelLayerHits );
+ track->summaryValue( m_el_nblayerolhits , xAOD::SummaryType::numberOfInnermostPixelLayerOutliers );
track->summaryValue( m_el_npixhits , xAOD::SummaryType::numberOfPixelHits );
track->summaryValue( m_el_npixolhits , xAOD::SummaryType::numberOfPixelOutliers );
track->summaryValue( m_el_nscthits , xAOD::SummaryType::numberOfSCTHits );
@@ -505,7 +505,7 @@ bool TrigEgammaNavTPNtuple::fillElectron( const xAOD::Electron *el ){
track->summaryValue( m_el_ntrthighthresolhits, xAOD::SummaryType::numberOfTRTHighThresholdOutliers );
track->summaryValue( m_el_ntrtolhits , xAOD::SummaryType::numberOfTRTOutliers );
track->summaryValue( m_el_ntrtxenonhits , xAOD::SummaryType::numberOfTRTXenonHits );
- //track->summaryValue( m_el_expectblayerhit , xAOD::SummaryType::expectBLayerHit );
+ //track->summaryValue( m_el_expectblayerhit , xAOD::SummaryType::expectInnermostPixelLayerHit );
track->summaryValue( m_el_npixdeadsensors , xAOD::SummaryType::numberOfPixelDeadSensors);
track->summaryValue( m_el_nsctdeadsensors , xAOD::SummaryType::numberOfSCTDeadSensors);
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Converter.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Converter.h
index 7fd6ad79d44..a6c4db1dfb2 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Converter.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Converter.h
@@ -129,13 +129,13 @@ class Converter {
// 2 "hits" and an offline SCT "hit" is really a 1D cluster, so two intersetcting
// stereo clusters making a spacepoint are two "hits"
const Trk::TrackSummary *summary = (*trackitr)->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
int nStrawHits = summary->get(Trk::numberOfTRTHits);
int nTrHits = summary->get(Trk::numberOfTRTHighThresholdHits);
int nSiHits = nPixelHits + nSctHits;
- bool expectBL = summary->get(Trk::expectBLayerHit);
+ bool expectBL = summary->get(Trk::expectInnermostPixelLayerHit);
const Trk::FitQuality *quality = (*trackitr)->fitQuality();
double chi2 = quality->chiSquared();
@@ -201,7 +201,7 @@ class Converter {
// 2 "hits" and an offline SCT "hit" is really a 1D cluster, so two intersetcting
// stereo clusters making a spacepoint are two "hits"
const Trk::TrackSummary *summary = trackitr->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
int nStrawHits = summary->get(Trk::numberOfTRTHits);
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h
index d8c39f82480..4c99b2d8006 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector_old.h
@@ -191,14 +191,14 @@ public:
// 2 "hits" and an offline SCT "hit" is really a 1D cluster, so two intersetcting
// stereo clusters making a spacepoint are two "hits"
const Trk::TrackSummary *summary = track->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
int nStrawHits = summary->get(Trk::numberOfTRTHits);
int nTrHits = summary->get(Trk::numberOfTRTHighThresholdHits);
int nSiHits = nPixelHits + nSctHits;
- bool expectBL = summary->get(Trk:: expectBLayerHit);
+ bool expectBL = summary->get(Trk:: expectInnermostPixelLayerHit);
const Trk::FitQuality *quality = track->fitQuality();
double chi2 = quality->chiSquared();
@@ -619,13 +619,13 @@ public:
std::cout << "Could not create TrackSummary - Track will likely fail hits requirements" << std::endl;
}
else{
- nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
nSctHits = summary->get(Trk::numberOfSCTHits);
nStrawHits = summary->get(Trk::numberOfTRTHits);
nTrHits = summary->get(Trk::numberOfTRTHighThresholdHits);
nSiHits = nPixelHits + nSctHits;
- expectBL = summary->get(Trk::expectBLayerHit);
+ expectBL = summary->get(Trk::expectInnermostPixelLayerHit);
for ( int ih=0 ; ih<20 ; ih++ ) {
if ( summary->isHit(Trk::DetectorType(ih)) ) bitmap |= ( 1<<hpmap[ih] );
}
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
index 46584edd2af..ca65fd3c64f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
@@ -110,9 +110,9 @@ bool TIDA::isGoodOffline(const Analysis::Muon& muon) {
/// maybe select all these track based quantitied om the TIDA::Track, so we dont
/// have to fuss with is it xAOD/is it not xAOD etc
// B-Layer hits
- int numberOfBLayerHits = summary->get(Trk::numberOfBLayerHits);
- bool expectBLayerHit = summary->get(Trk::expectBLayerHit);
- if (expectBLayerHit && numberOfBLayerHits<1) return false;
+ int numberOfInnermostPixelLayerHits = summary->get(Trk::numberOfInnermostPixelLayerHits);
+ bool expectInnermostPixelLayerHit = summary->get(Trk::expectInnermostPixelLayerHit);
+ if (expectInnermostPixelLayerHit && numberOfInnermostPixelLayerHits<1) return false;
// Pix hits
int nPixelHits = summary->get(Trk::numberOfPixelHits);
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
index e8d75e75fcd..69ccfa1aa46 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
@@ -162,14 +162,14 @@ void TrigTrackSelector::selectTrack( const Rec::TrackParticle* track ) {
// 2 "hits" and an offline SCT "hit" is really a 1D cluster, so two intersetcting
// stereo clusters making a spacepoint are two "hits"
const Trk::TrackSummary *summary = track->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
int nStrawHits = summary->get(Trk::numberOfTRTHits);
int nTrHits = summary->get(Trk::numberOfTRTHighThresholdHits);
int nSiHits = nPixelHits + nSctHits;
- bool expectBL = summary->get(Trk:: expectBLayerHit);
+ bool expectBL = summary->get(Trk:: expectInnermostPixelLayerHit);
const Trk::FitQuality *quality = track->fitQuality();
double chi2 = quality->chiSquared();
@@ -612,13 +612,13 @@ void TrigTrackSelector::selectTrack( const Trk::Track* track ) {
std::cerr << "Could not create TrackSummary - Track will likely fail hits requirements" << std::endl;
}
else{
- nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
nSctHits = summary->get(Trk::numberOfSCTHits);
nStrawHits = summary->get(Trk::numberOfTRTHits);
nTrHits = summary->get(Trk::numberOfTRTHighThresholdHits);
nSiHits = nPixelHits + nSctHits;
- expectBL = summary->get(Trk::expectBLayerHit);
+ expectBL = summary->get(Trk::expectInnermostPixelLayerHit);
for ( int ih=0 ; ih<20 ; ih++ ) {
if ( summary->isHit(Trk::DetectorType(ih)) ) bitmap |= ( 1<<hpmap[ih] );
}
@@ -752,7 +752,7 @@ void TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
// stereo clusters making a spacepoint are two "hits"
uint8_t sum_nBlayerHits = 0;
- track->summaryValue( sum_nBlayerHits, xAOD::numberOfBLayerHits);
+ track->summaryValue( sum_nBlayerHits, xAOD::numberOfInnermostPixelLayerHits);
int nBlayerHits = 2*sum_nBlayerHits;
uint8_t sum_nPixelHits = 0;
@@ -773,7 +773,7 @@ void TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
uint8_t sum_expectBL = 0;
- track->summaryValue( sum_expectBL, xAOD::expectBLayerHit);
+ track->summaryValue( sum_expectBL, xAOD::expectInnermostPixelLayerHit);
bool expectBL = ( sum_expectBL ? true : false );
diff --git a/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx b/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx
index 607b89de53b..4696b4be005 100644
--- a/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx
+++ b/Trigger/TrigFTK/TrigFTKSim/src/FTKMergerAlgo.cxx
@@ -1933,16 +1933,16 @@ Rec::TrackParticle* FTKMergerAlgo::createTrackParticle(const Trk::Track* track,
}
- tracksum[Trk::numberOfBLayerHits] = bitmask&(1<<0);
+ tracksum[Trk::numberOfInnermostPixelLayerHits] = bitmask&(1<<0);
tracksum[Trk::numberOfPixelHits] = npixel;
tracksum[Trk::numberOfPixelHoles] = npixelholes;
tracksum[Trk::numberOfSCTHits] = nsct;
tracksum[Trk::numberOfSCTHoles] = nsctholes;
- tracksum[Trk::expectBLayerHit] = 1.0;
+ tracksum[Trk::expectInnermostPixelLayerHit] = 1.0;
- tracksum[Trk::numberOfBLayerOutliers ] = 0;
- tracksum[Trk::numberOfBLayerSharedHits ] = 0;
+ tracksum[Trk::numberOfInnermostPixelLayerOutliers ] = 0;
+ tracksum[Trk::numberOfInnermostPixelLayerSharedHits ] = 0;
tracksum[Trk::numberOfPixelOutliers ] = 0;
tracksum[Trk::numberOfPixelSharedHits ] = 0;
tracksum[Trk::numberOfGangedPixels ] = 0;
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetFex.cxx b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetFex.cxx
index edc6939a079..be659159086 100755
--- a/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetFex.cxx
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/src/TrigBjetFex.cxx
@@ -723,7 +723,7 @@ bool TrigBjetFex::trackSel(const xAOD::TrackParticle*& track, unsigned int i, in
uint8_t nPixHits = 0;
uint8_t nSCTHits = 0;
- //track->summaryValue(nBlayerHits, xAOD::numberOfBLayerHits);
+ //track->summaryValue(nBlayerHits, xAOD::numberOfInnermostPixelLayerHits);
track->summaryValue(nInnermostHits, xAOD::numberOfInnermostPixelLayerHits);
track->summaryValue(nNextToInnermostHits, xAOD::numberOfNextToInnermostPixelLayerHits);
track->summaryValue(nPixHits, xAOD::numberOfPixelHits);
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
index 3a8edd9344d..46b3a0c962a 100755
--- a/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigHIHypo/src/TrigHIEFTrackHypo.cxx
@@ -184,7 +184,7 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
bool ok=true;
if (m_applyTrackCut) {
// int ncontrib_pixel = summary->get(Trk::numberOfContribPixelLayers);
- int nblayer = summary->get(Trk::numberOfBLayerHits);
+ int nblayer = summary->get(Trk::numberOfInnermostPixelLayerHits);
int npixel = summary->get(Trk::numberOfPixelHits);
int nsct = summary->get(Trk::numberOfSCTHits);
int ntrt = summary->get(Trk::numberOfTRTHits);
@@ -201,7 +201,7 @@ HLT::ErrorCode TrigHIEFTrackHypo::hltExecute(const HLT::TriggerElement* outputTE
if (perigee) d0 = perigee->parameters()[Trk::d0];
float pt = (*trkIt)->pt();
-// if (summary->get(Trk::expectBLayerHit) &&
+// if (summary->get(Trk::expectInnermostPixelLayerHit) &&
// nblayer < m_numBLayerHits) ok = false;
if (nblayer < m_numBLayerHits) ok = false;
if (npixel < m_numPixelHits) ok = false;
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
index 9da428e3a55..2fd04965fcb 100755
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool.cxx
@@ -1449,7 +1449,7 @@ void HLTXAODBphysMonTool::fillTrigBphysHists(const xAOD::TrigBphys *bphysItem, c
float etaTrk1 = ptl1->eta();
uint8_t tmpValue(0);
- int bLayerHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfBLayerHits) ? tmpValue : -99;
+ int bLayerHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfInnermostPixelLayerHits) ? tmpValue : -99;
int sctHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfSCTHits) ? tmpValue : -99;
int pixHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfPixelHits) ? tmpValue : -99;
int trtHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfTRTHits) ? tmpValue : -99;
@@ -1492,7 +1492,7 @@ void HLTXAODBphysMonTool::fillTrigBphysHists(const xAOD::TrigBphys *bphysItem, c
float etaTrk2 = ptl2->eta();
tmpValue = 0;
- int bLayerHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfBLayerHits) ? tmpValue : -99;
+ int bLayerHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfInnermostPixelLayerHits) ? tmpValue : -99;
int sctHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfSCTHits) ? tmpValue : -99;
int pixHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfPixelHits) ? tmpValue : -99;
int trtHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfTRTHits) ? tmpValue : -99;
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool_orig.cpp b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool_orig.cpp
index 67c1d259073..bdf64828453 100755
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool_orig.cpp
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/src/HLTXAODBphysMonTool_orig.cpp
@@ -596,7 +596,7 @@ void HLTXAODBphysMonTool::fillHist(const xAOD::TrigBphys *bphysItem, const std::
float etaTrk1 = ptl1->eta();
uint8_t tmpValue(0);
- int bLayerHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfBLayerHits) ? tmpValue : -99;
+ int bLayerHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfInnermostPixelLayerHits) ? tmpValue : -99;
int sctHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfSCTHits) ? tmpValue : -99;
int pixHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfPixelHits) ? tmpValue : -99;
int trtHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfTRTHits) ? tmpValue : -99;
@@ -625,7 +625,7 @@ void HLTXAODBphysMonTool::fillHist(const xAOD::TrigBphys *bphysItem, const std::
float etaTrk2 = ptl2->eta();
tmpValue = 0;
- int bLayerHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfBLayerHits) ? tmpValue : -99;
+ int bLayerHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfInnermostPixelLayerHits) ? tmpValue : -99;
int sctHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfSCTHits) ? tmpValue : -99;
int pixHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfPixelHits) ? tmpValue : -99;
int trtHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfTRTHits) ? tmpValue : -99;
@@ -752,7 +752,7 @@ void HLTXAODBphysMonTool::fillHistEff(const xAOD::TrigBphys *bphysItem, const st
float etaTrk1 = ptl1->eta();
uint8_t tmpValue(0);
- // int bLayerHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfBLayerHits) ? tmpValue : -99;
+ // int bLayerHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfInnermostPixelLayerHits) ? tmpValue : -99;
int sctHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfSCTHits) ? tmpValue : -99;
// int pixHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfPixelHits) ? tmpValue : -99;
// int trtHitsTrk1 = ptl1->summaryValue(tmpValue,xAOD::numberOfTRTHits) ? tmpValue : -99;
@@ -782,7 +782,7 @@ void HLTXAODBphysMonTool::fillHistEff(const xAOD::TrigBphys *bphysItem, const st
float etaTrk2 = ptl2->eta();
//tmpValue = 0;
- // int bLayerHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfBLayerHits) ? tmpValue : -99;
+ // int bLayerHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfInnermostPixelLayerHits) ? tmpValue : -99;
// int sctHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfSCTHits) ? tmpValue : -99;
// int pixHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfPixelHits) ? tmpValue : -99;
// int trtHitsTrk2 = ptl2->summaryValue(tmpValue,xAOD::numberOfTRTHits) ? tmpValue : -99;
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h
index ff9db3d3d5d..4e39b3a047b 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h
@@ -504,14 +504,14 @@ namespace TrigInDetAnalysis {
// 2 "hits" and an offline SCT "hit" is really a 1D cluster, so two intersetcting
// stereo clusters making a spacepoint are two "hits"
const Trk::TrackSummary *summary = track->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
int nStrawHits = summary->get(Trk::numberOfTRTHits);
int nTrHits = summary->get(Trk::numberOfTRTHighThresholdHits);
int nSiHits = nPixelHits + nSctHits;
- bool expectBL = summary->get(Trk::expectBLayerHit);
+ bool expectBL = summary->get(Trk::expectInnermostPixelLayerHit);
const Trk::FitQuality *quality = track->fitQuality();
double chi2 = quality->chiSquared();
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx
index 6cd54667541..bdd8c00a764 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx
@@ -708,7 +708,7 @@ void AnalysisConfig_Jpsi::loop() {
if(closestProbe) {
const Trk::TrackSummary *summary = closestProbe->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
//int nStrawHits = summary->get(Trk::numberOfTRTHits);
@@ -725,7 +725,7 @@ void AnalysisConfig_Jpsi::loop() {
}
if(closestTag) {
const Trk::TrackSummary *summary = closestTag->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
//int nStrawHits = summary->get(Trk::numberOfTRTHits);
diff --git a/Trigger/TrigTools/TrigJPsiTools/TrigJPsiTools/MuonTrackSelector.h b/Trigger/TrigTools/TrigJPsiTools/TrigJPsiTools/MuonTrackSelector.h
index 670f179952a..d2fbb74f2ed 100644
--- a/Trigger/TrigTools/TrigJPsiTools/TrigJPsiTools/MuonTrackSelector.h
+++ b/Trigger/TrigTools/TrigJPsiTools/TrigJPsiTools/MuonTrackSelector.h
@@ -257,7 +257,7 @@ class MuonTrackSelector : public MuonTrackAdder {
// 2 "hits" and an offline SCT "hit" is really a 1D cluster, so two intersetcting
// stereo clusters making a spacepoint are two "hits"
const Trk::TrackSummary* summary = track->trackSummary();
- int nBlayerHits = 2*summary->get(Trk::numberOfBLayerHits);
+ int nBlayerHits = 2*summary->get(Trk::numberOfInnermostPixelLayerHits);
int nPixelHits = 2*summary->get(Trk::numberOfPixelHits);
int nSctHits = summary->get(Trk::numberOfSCTHits);
int nStrawHits = summary->get(Trk::numberOfTRTHits);
--
GitLab