diff --git a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
index 7176aebbf7eb1e6f0d29dc969dc74ca22051cb8e..dcb5d39110b2ddf27422b6c68c3a109b2ce5c9a6 100644
--- a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
+++ b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
@@ -225,7 +225,7 @@ def tauMonitoringConfig(inputFlags):
igroup.defineHistogram(namer('tauEtEt15BDTLoose','et','Identification_BDTLoose15GeV',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
xbins=60, xmin=0., xmax=300.,path=folder+"Identification/BDTLoose15GeV")
- igroup.defineHistogram(namer('PanModeEt15BDTLoose','PanMode','Identification_BDTLoose15GeV',postfix), title='tau decay mode from PanTau upon JetBDTSigMedium;mode',
+ igroup.defineHistogram(namer('panModeEt15BDTLoose','panMode','Identification_BDTLoose15GeV',postfix), title='tau decay mode from panTau upon JetBDTSigMedium;mode',
xbins=5, xmin=0., xmax=5., path=folder+"Identification/BDTLoose15GeV", labels=["1p0n","1p1n","1pXn","3p0n","3pXn"])
igroup.defineHistogram(namer('jetSeedEta','jetSeedEta','Calo',postfix), title='Calorimeter eta of tau candidates;Eta;Numbers of Candidates',path=folder+"Calo",
@@ -310,7 +310,7 @@ def tauMonitoringConfig(inputFlags):
xbins=20, xmin=0., xmax=2. )
#Substructure Histograms
- igroup.defineHistogram(namer('PanModeSubstructure','PanMode','SubStructure',postfix), title='tau decay mode from PanTau upon JetBDTSigMedium;mode',
+ igroup.defineHistogram(namer('panModeSubstructure','panMode','SubStructure',postfix), title='tau decay mode from PanTau upon JetBDTSigMedium;mode',
xbins=8, xmin=0., xmax=8., path=folder+"SubStructure")
igroup.defineHistogram(namer('BDTScoreAsP0','BDTScoreAsP0','SubStructure',postfix), title='BDT score indentifying pion zero ; BDT score',path=folder+"SubStructure",
@@ -372,7 +372,7 @@ def tauMonitoringConfig(inputFlags):
xbins=1200,xmin=0,xmax=1200,ybins=50,ymin=-35.,ymax=35)
- igroup.defineHistogram(namer('eta_track','eta','Track',postfix), title='Track Eta;Eta',path=folder+"Track",
+ igroup.defineHistogram(namer('etaTrack','eta','Track',postfix), title='Track Eta;Eta',path=folder+"Track",
xbins=51, xmin=-2.55, xmax=2.55 )
igroup.defineHistogram(namer('leadTrkPt','leadTrkPt','Track',postfix), title='Pt of Leading track;Transverse Momentum (GeV)',path=folder+"Track",
@@ -394,10 +394,10 @@ def tauMonitoringConfig(inputFlags):
igroup.defineHistogram(namer('numberOfTRTOutliers','numberOfTRTOutliers','Track',postfix), title="Number of TRT Low Threshold Outliers;Number of TRT Low Threshold Outliers",path=folder+"Track",
xbins=31, xmin=-0.5, xmax=25.5)
- igroup.defineHistogram(namer('pT_track','pT_track','Track',postfix), title='Track pT;Transverse Momentum (GeV)',path=folder+"Track",
+ igroup.defineHistogram(namer('ptTrack','pT','Track',postfix), title='Track pT;Transverse Momentum (GeV)',path=folder+"Track",
xbins=60, xmin=0, xmax=300 )
- igroup.defineHistogram(namer('phi_track','phi_track','Track',postfix), title='Track Phi;Phi',path=folder+"Track",
+ igroup.defineHistogram(namer('phiTrack','phi','Track',postfix), title='Track Phi;Phi',path=folder+"Track",
xbins=64, xmin=PHIMIN, xmax=PHIMAX )
igroup.defineHistogram(namer('rConv','rConv','Track',postfix), title='rConv;rConv',path=folder+"Track",
diff --git a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
index d0918c244bf9c426279db22ec55dc63dd93205df..b96ea0c30b183d29ab1ae00a589f8ddd30105f18 100644
--- a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
+++ b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
@@ -5,7 +5,7 @@
#include "tauMonitoring/tauMonitorAlgorithm.h"
#include "GaudiKernel/SystemOfUnits.h"
-#include <xAODCore/ShallowCopy.h>
+#include "xAODCore/ShallowCopy.h"
using Gaudi::Units::GeV;
@@ -52,8 +52,8 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
auto tauPhi = Monitored::Scalar<float>("tauPhi",0.0);
auto tauEt = Monitored::Scalar<float>("tauEt",0.0);
auto tauEtEt15BDTLoose = Monitored::Scalar<float>("tauEtEt15BDTLoose",0.0);
- auto PanModeEt15BDTLoose = Monitored::Scalar<float>("PanModeEt15BDTLoose",0.0);
- auto PanModeSubstructure = Monitored::Scalar<float>("PanModeSubstructure",0.0);
+ auto panModeEt15BDTLoose = Monitored::Scalar<float>("panModeEt15BDTLoose",0.0);
+ auto panModeSubstructure = Monitored::Scalar<float>("panModeSubstructure",0.0);
auto coreTrk = Monitored::Scalar<float>("coreTrk",0.0);
auto PtTESMVA = Monitored::Scalar<float>("PtTESMVA",0.0);
auto PtCombined = Monitored::Scalar<float>("PtCombined",0.0);
@@ -140,9 +140,9 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
auto z0TJVA = Monitored::Scalar<float>("z0TJVA",0.0);
auto z0PriVtx = Monitored::Scalar<float>("z0PriVtx",0.0);
- auto eta_track = Monitored::Scalar<float>("eta_track",0.0);
- auto pT_track = Monitored::Scalar<float>("pT_track",0.0);
- auto phi_track = Monitored::Scalar<float>("phi_track",0.0);
+ auto etaTrack = Monitored::Scalar<float>("etaTrack",0.0);
+ auto ptTrack = Monitored::Scalar<float>("ptTrack",0.0);
+ auto phiTrack = Monitored::Scalar<float>("phiTrack",0.0);
auto leadTrkPt = Monitored::Scalar<float>("leadTrkPt",0.0);
auto nHighPtTaus = Monitored::Scalar<float>("nHighPtTaus",0.0);
auto numberOfTRTHighThresholdHits = Monitored::Scalar<float>("numberOfTRTHighThresholdHits",0.0);
@@ -241,12 +241,12 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
nNeutPFO = tau->nProtoNeutralPFOs();
nShot = tau->nShotPFOs() ;
- int panmode = -1 ;
- int panmodeSubstructure = -1 ;
+ int panModeDummy = -1 ;
+ int panModeSubstructureDummy = -1 ;
const auto& trigDecTool = getTrigDecisionTool();
- if (m_etaMin < fabs(tauEta) && fabs(tauEta) < m_etaMax){
+ if (m_etaMin < std::abs(tauEta) && std::abs(tauEta) < m_etaMax){
nTauCandidates +=1;
if(tauEt > higherEtThreshold){
@@ -270,15 +270,14 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
nClustersEt15BDTLoose = tau->detail<int>(xAOD::TauJetParameters::numTopoClusters) ;
NumTracksEt15BDTLoose = tau->nTracks();
- tau->panTauDetail(xAOD::TauJetParameters::PanTau_DecayMode, panmode);
- PanModeEt15BDTLoose = panmode;
-
+ tau->panTauDetail(xAOD::TauJetParameters::PanTau_DecayMode, panModeDummy);
+ panModeEt15BDTLoose = panModeDummy;
fill(tool,tauPhiEt15BDTLoose);
fill(tool,tauEtaEt15BDTLoose);
fill(tool,nClustersEt15BDTLoose);
fill(tool,NumTracksEt15BDTLoose);
fill(tool,tauEtEt15BDTLoose);
- fill(tool,PanModeEt15BDTLoose);
+ fill(tool,panModeEt15BDTLoose);
}
if (tau->nTracks()!= 0){
@@ -348,12 +347,12 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
d0 = perigee.parameters()[Trk::d0];
fill(tool,d0);
//z0 missing
- phi_track = perigee.parameters()[Trk::phi];
- fill(tool,phi_track);
- eta_track = perigee.eta();
- fill(tool,eta_track);
- pT_track = perigee.pT()/GeV;
- fill(tool,pT_track);
+ phiTrack = perigee.parameters()[Trk::phi];
+ fill(tool,phiTrack);
+ etaTrack = perigee.eta();
+ fill(tool,etaTrack);
+ ptTrack = perigee.pT()/GeV;
+ fill(tool,ptTrack);
}
//this else can be removed, but it sets any track variable to 0 if there are no tracks
//this solution makes entry numbers match calo which is desired but there are too many zeros.
@@ -428,11 +427,11 @@ StatusCode tauMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const
fill(tool,trkAvgDist);
fill(tool,lumiPerBCID);
- tau->panTauDetail(xAOD::TauJetParameters::PanTau_DecayMode, panmodeSubstructure);
- PanModeSubstructure = panmodeSubstructure;
- fill(tool,PanModeSubstructure);
+ tau->panTauDetail(xAOD::TauJetParameters::PanTau_DecayMode, panModeSubstructureDummy);
+
+ panModeSubstructure = panModeSubstructureDummy;
-
+ fill(tool,panModeSubstructure);
if ( panPhi > -100 ){
fill(tool,panEta);
fill(tool,panPhi);