diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
index 5adc58c480315f358c59417c7627e7e485a5d095..e2b8234366ad0189a6e77fff44a1b71dcffce5df 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/CaloMuonLikelihoodTool.h
@@ -10,12 +10,10 @@
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ServiceHandle.h"
-#include "StoreGate/StoreGateSvc.h"
#include "CaloEvent/CaloClusterContainer.h"
-#include <string>
+#include <vector>
class TFile;
class TH1F;
@@ -45,11 +43,10 @@ private:
const TH1F* m_TH1F_bkg[9][11];
std::string m_TH1F_key[9][11];
int m_numKeys[9];
- mutable int m_cnt_warn;
-
- std::vector<std::string> m_fileNames;
+ mutable int m_cnt_warn{};
ToolHandle<ITrackEnergyInCaloTool> m_trkEnergyInCalo;
+ std::vector<std::string> m_fileNames;
};
#endif
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
index 914029fd6e21910cb2e740fefee9ebe4107c6c2f..8a0279d7de93896ec8ee4e38986a1a1e2f08d472 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackDepositInCaloTool.h
@@ -7,23 +7,19 @@
// --- Tools ---
#include "ICaloTrkMuIdTools/ITrackDepositInCaloTool.h"
-#include "ICaloTrkMuIdTools/ITrackEnergyInCaloTool.h"
#include "TrkExInterfaces/IExtrapolator.h"
-#include "CaloInterface/ICaloNoiseTool.h"
// --- Athena common ---
#include "AthenaBaseComps/AthAlgTool.h"
#include "GaudiKernel/ToolHandle.h"
-#include "GaudiKernel/ITHistSvc.h"
// --- Athena ---
-#include "CaloEvent/CaloCellContainer.h"
#include "xAODTracking/TrackParticle.h"
#include "RecoToolInterfaces/IParticleCaloExtensionTool.h"
#include "RecoToolInterfaces/IParticleCaloCellAssociationTool.h"
// --- STL ---
-#include <utility>
+#include <map>
#include <vector>
// --- Forward declarations ---
@@ -33,7 +29,7 @@ class TileDetDescrManager;
class TH1F;
class TH2F;
-
+class ITHistSvc;
class CaloDetDescrManager;
@@ -156,7 +152,6 @@ class TrackDepositInCaloTool: public AthAlgTool, virtual public ITrackDepositInC
const Trk::TrackParameters* extrapolateToEntranceOfLayer(const Trk::TrackParameters* par, const CaloDetDescriptor* descr) const;
const Trk::TrackParameters* extrapolateToExitOfLayer(const Trk::TrackParameters* par, const CaloDetDescriptor* descr) const;
-// double distanceInTile(const Trk::TrackParameters* par, const Trk::TrackParameters* parExit, const CaloDetDescrElement* dde, double cell_z_min, double cell_z_max) const;
double distance(const Amg::Vector3D& p1, const Amg::Vector3D& p2) const;
bool isInsideDomain(double position, double domainCenter, double domainWidth, bool phiVariable = false) const;
@@ -167,10 +162,10 @@ class TrackDepositInCaloTool: public AthAlgTool, virtual public ITrackDepositInC
private:
// Services & Tools
- ITHistSvc* m_histSvc; //!< Pointer to THistSvc
+ ITHistSvc* m_histSvc{}; //!< Pointer to THistSvc
ToolHandle<Trk::IExtrapolator> m_extrapolator; //!< Extrapolator tool
- const CaloDetDescrManager* m_caloDDM; //!< Calorimeter detector description manager
- const TileDetDescrManager* m_tileDDM;
+ const CaloDetDescrManager* m_caloDDM{}; //!< Calorimeter detector description manager
+ const TileDetDescrManager* m_tileDDM{};
ToolHandle <Trk::IParticleCaloExtensionTool> m_caloExtensionTool; //!< Tool to make the step-wise extrapolation
ToolHandle <Rec::IParticleCaloCellAssociationTool> m_caloCellAssociationTool; //!< Tool to make the step-wise extrapolation
@@ -183,34 +178,32 @@ class TrackDepositInCaloTool: public AthAlgTool, virtual public ITrackDepositInC
bool m_debugMode; //!< Flag to run in specialized debug mode
bool m_showNeighbours;
double m_solenoidRadius; //!< Radius of the solenoid surrounding the ID
- //double m_solenoidHalfLength; //!< Halflength of the solenoid surrounding the ID
CaloLayerMap m_barrelLayerMap; //!< std::map of \f$r\f$ distance versus descriptor for cylindrical calo regions
CaloLayerMap m_endCapLayerMap; //!< std::map of \f$z\f$ distance versus descriptor for disc-like calo regions
- //mutable int m_stacks; //!< Counts the number of stacks (diagnoses indefinite recursion).
// Histograms
- TH1F* m_hDepositLayer12;
- TH1F* m_hDepositLayer13;
- TH1F* m_hDepositLayer14;
+ TH1F* m_hDepositLayer12{};
+ TH1F* m_hDepositLayer13{};
+ TH1F* m_hDepositLayer14{};
- TH2F* m_hParELossEta;
- TH2F* m_hParELossSample;
+ TH2F* m_hParELossEta{};
+ TH2F* m_hParELossSample{};
///////////////////////////////
- TH1F* m_hDeltaEtaLastPar;
- TH1F* m_hDeltaRadiusLastPar;
- TH1F* m_hDepositsInCore;
- TH1F* m_hDepositsInCone;
- TH2F* m_hDistDepositsTile;
- TH2F* m_hDistDepositsHEC;
+ TH1F* m_hDeltaEtaLastPar{};
+ TH1F* m_hDeltaRadiusLastPar{};
+ TH1F* m_hDepositsInCore{};
+ TH1F* m_hDepositsInCone{};
+ TH2F* m_hDistDepositsTile{};
+ TH2F* m_hDistDepositsHEC{};
- TH2F* m_hEMB1vsdPhi;
- TH2F* m_hEMB2vsdPhi;
- TH2F* m_hEMB3vsdPhi;
- TH2F* m_hEMB1vsdEta;
- TH2F* m_hEMB2vsdEta;
- TH2F* m_hEMB3vsdEta;
+ TH2F* m_hEMB1vsdPhi{};
+ TH2F* m_hEMB2vsdPhi{};
+ TH2F* m_hEMB3vsdPhi{};
+ TH2F* m_hEMB1vsdEta{};
+ TH2F* m_hEMB2vsdEta{};
+ TH2F* m_hEMB3vsdEta{};
};
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.h b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.h
index 494db6b2e00ccfe2f1080f1d0b39a76d09d35049..b0edbb6e218ea2f46ee4f1f6687cdf1a67b14445 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.h
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/CaloTrkMuIdTools/TrackEnergyInCaloTool.h
@@ -139,7 +139,7 @@ class TrackEnergyInCaloTool: public AthAlgTool, virtual public ITrackEnergyInCa
/** Class member version of retrieving MsgStream */
//int m_outputlevel;
- const CaloDetDescrManager* m_calo_dd;
+ const CaloDetDescrManager* m_calo_dd{};
// Pre-configured extrapolator : will be choosen via jobOpt
ToolHandle<Trk::IExtrapolator> m_extrapolator;
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
index ededf06bc555be55f177658b449fdb243f2b0d0d..b430d097ded7d7ee3ca8329a3255d8b82ea5eafe 100644
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/CaloMuonLikelihoodTool.cxx
@@ -22,8 +22,8 @@
#include "TH1F.h"
#include <string>
-#include <stdio.h>
-#include <math.h>
+#include <iostream>
+#include <cmath>
#include <map>
@@ -35,23 +35,13 @@ namespace Units = Athena::Units;
///////////////////////////////////////////////////////////////////////////////
CaloMuonLikelihoodTool::CaloMuonLikelihoodTool(const std::string& type, const std::string& name, const IInterface* parent) :
AthAlgTool(type,name,parent),
- m_trkEnergyInCalo("TrackEnergyInCaloTool")//,
- // m_clusCont(0)
+ m_trkEnergyInCalo("TrackEnergyInCaloTool"),
+ m_fileNames{"CaloMuonLikelihood.PDF.A0.root", "CaloMuonLikelihood.PDF.A1.root",
+ "CaloMuonLikelihood.PDF.A2.root", "CaloMuonLikelihood.PDF.B0.root", "CaloMuonLikelihood.PDF.B1.root",
+ "CaloMuonLikelihood.PDF.B2.root", "CaloMuonLikelihood.PDF.C0.root", "CaloMuonLikelihood.PDF.C1.root",
+ "CaloMuonLikelihood.PDF.C2.root"}
{
declareInterface<ICaloMuonLikelihoodTool>(this);
-
- m_fileNames.clear();
-
- m_fileNames.push_back("CaloMuonLikelihood.PDF.A0.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.A1.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.A2.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.B0.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.B1.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.B2.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.C0.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.C1.root");
- m_fileNames.push_back("CaloMuonLikelihood.PDF.C2.root");
-
declareProperty("RootFileNames", m_fileNames);
declareProperty("TrackEnergyInCaloTool",m_trkEnergyInCalo);
}
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
index 84a36dfc474a78f09e0331cb027740be00d58dfc..66207b4c8315dd5648e3d20a122b7ea035b4d9d3 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackDepositInCaloTool.cxx
@@ -22,14 +22,13 @@
#include "TileDetDescr/TileCellDim.h"
#include "CaloUtils/CaloCellList.h"
-//#include "TrackToCalo/CaloCellHelpers.h"
#include "CaloGeoHelpers/CaloPhiRange.h"
#include "ParticleCaloExtension/ParticleCellAssociationCollection.h"
#include "ParticleCaloExtension/ParticleCellIntersection.h"
#include "ParticleCaloExtension/ParticleCaloAssociation.h"
#include "TrkCaloExtension/CaloExtension.h"
#include "TrkCaloExtension/CaloExtensionHelpers.h"
-
+#include "GaudiKernel/ITHistSvc.h"
// --- ROOT ---
#include "TH1F.h"
#include "TH2F.h"
diff --git a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.cxx b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.cxx
index 04d1f6e13faa69d21eb17a03ccd50eeb3f2e1dfb..ea7b5f15a4194e7229fbb986173428095d210936 100755
--- a/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.cxx
+++ b/Reconstruction/MuonIdentification/CaloTrkMuIdTools/src/TrackEnergyInCaloTool.cxx
@@ -9,6 +9,8 @@
// --- Calo ---
#include "CaloDetDescr/CaloDetDescrManager.h"
#include "CaloDetDescr/CaloDetDescriptor.h"
+//
+#include <memory> //unique_ptr
///////////////////////////////////////////////////////////////////////////////
// TrackEnergyInCaloTool constructor
@@ -221,7 +223,7 @@ const Trk::TrackParameters* TrackEnergyInCaloTool::paramInLastSample(const Trk::
&& sample != CaloCell_ID::HEC3 )
return param;
- Trk::Surface* surf = 0;
+ std::unique_ptr<Trk::Surface> surf{};
double trketa = 0.;
// Take eta of the last measured hit as best guess and create surface :
@@ -231,7 +233,7 @@ const Trk::TrackParameters* TrackEnergyInCaloTool::paramInLastSample(const Trk::
DataVector <const Trk::TrackParameters>::const_iterator itEnd = paramvec->end();
--itEnd;
trketa = (*itEnd)->eta();
- surf = m_calosurf->CreateLastSurface(sample,offset,trketa);
+ surf.reset(m_calosurf->CreateLastSurface(sample,offset,trketa));
}
if(trk){
if (surf){
@@ -243,8 +245,6 @@ const Trk::TrackParameters* TrackEnergyInCaloTool::paramInLastSample(const Trk::
ATH_MSG_DEBUG("Extrapolation succesful");
else
ATH_MSG_DEBUG("Extrapolation failed");
-
- delete surf;
}
}
return param;