diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetDetailedTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetDetailedTrackSelectorTool.h index 7988bd83f847c4d86428f1b20a86b2d4eefc5af6..7d72fbaebb0507b09ea7808b5c9a4a776a200f56 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetDetailedTrackSelectorTool.h +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetDetailedTrackSelectorTool.h @@ -23,8 +23,6 @@ #include "MagFieldElements/AtlasFieldCache.h" #include "CLHEP/Units/SystemOfUnits.h" -using CLHEP::GeV; -using CLHEP::mm; /** * @file InDetDetailedTrackSelectorTool.h @@ -100,14 +98,14 @@ namespace InDet bool preselectionBeforeExtrapolation(const Trk::Perigee & myPerigee) const; Amg::Vector3D getPosOrBeamSpot(const xAOD::Vertex*) const; - DoubleProperty m_pTMin{this, "pTMin", 1.*GeV, "min. pT: |pT|>pTMin"}; + DoubleProperty m_pTMin{this, "pTMin", 1.*CLHEP::GeV, "min. pT: |pT|>pTMin"}; DoubleProperty m_pMin{this, "pMin", 0., "min. p = pT/cos(theta): |p| > pMin"}; - DoubleProperty m_IPd0Max{this, "IPd0Max", 2.*mm, "max. d0: |d0|<d0Max"}; - DoubleProperty m_IPz0Max{this, "IPz0Max", 1.5*mm, "max. z0: |z0*sin(theta)|<z0Max"}; - DoubleProperty m_z0Max{this, "z0Max", 9999.*mm, "max. z0: |z0|<z0Max"}; - DoubleProperty m_sigIPd0Max{this, "sigIPd0Max", 999.*mm, "max d0 error"}; + DoubleProperty m_IPd0Max{this, "IPd0Max", 2.*CLHEP::mm, "max. d0: |d0|<d0Max"}; + DoubleProperty m_IPz0Max{this, "IPz0Max", 1.5*CLHEP::mm, "max. z0: |z0*sin(theta)|<z0Max"}; + DoubleProperty m_z0Max{this, "z0Max", 9999.*CLHEP::mm, "max. z0: |z0|<z0Max"}; + DoubleProperty m_sigIPd0Max{this, "sigIPd0Max", 999.*CLHEP::mm, "max d0 error"}; DoubleProperty m_sigIPz0Max - {this, "sigIPz0Max", 999.*mm, "max (error only due to z0)*sin(theta)"}; + {this, "sigIPz0Max", 999.*CLHEP::mm, "max (error only due to z0)*sin(theta)"}; DoubleProperty m_d0significanceMax {this, "d0significanceMax", -1., "max IP significance d0 (-1 switches it off)"}; DoubleProperty m_z0significanceMax diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h index 2d7bdbb275a2e402e3d391b01989e14de3d83d8f..71d9ded395f818b6c3504aad9548f6fbbfb7f01d 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetIsoTrackSelectorTool.h @@ -12,7 +12,6 @@ #include "CLHEP/Units/SystemOfUnits.h" -using CLHEP::mm; /** * @file InDetIsoTrackSelectorTool.h @@ -58,8 +57,8 @@ namespace InDet /** Robust cut window setting */ BooleanProperty m_robustCuts{this, "RobustCuts", true}; BooleanProperty m_applySinThetaCorrection{this, "SinThetaCorrection", true}; - DoubleProperty m_d0max{this, "maxD0", 1.5*mm}; - DoubleProperty m_z0stMax{this, "maxZ0", 1.5*mm}; + DoubleProperty m_d0max{this, "maxD0", 1.5*CLHEP::mm}; + DoubleProperty m_z0stMax{this, "maxZ0", 1.5*CLHEP::mm}; /** Sophisticated cut window setting : d0/z0 significance - only when robustCuts off*/ DoubleProperty m_d0Significance{this, "maxD0overSigmaD0", 3.}; DoubleProperty m_z0Significance{this, "maxZ0overSigmaZ0", 3.}; diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h index 50f28694ed84aa44ea47f1339343ce92b4289a78..c05a99320a6c71622c75d63a0ca0a0f72304a369 100644 --- a/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h +++ b/InnerDetector/InDetRecTools/InDetTrackSelectorTool/InDetTrackSelectorTool/InDetTrackSelectorTool.h @@ -13,7 +13,6 @@ #include "CLHEP/Units/SystemOfUnits.h" -using CLHEP::mm; /** * @file InDetTrackSelectorTool.h @@ -69,9 +68,9 @@ namespace InDet DoubleProperty m_minPt{this, "minPt", 500., "Minimum Pt of tracks"}; DoubleProperty m_IPz0Max - {this, "IPz0Max", 10.*mm, "max. z0: |z0*sin(theta)| < z0Max"}; + {this, "IPz0Max", 10.*CLHEP::mm, "max. z0: |z0*sin(theta)| < z0Max"}; DoubleProperty m_maxZ0{this, "maxZ0", 99999., "Maximum z0 of tracks"}; - DoubleProperty m_maxD0{this, "maxD0", 2.*mm, "Maximum d0 of tracks"}; + DoubleProperty m_maxD0{this, "maxD0", 2.*CLHEP::mm, "Maximum d0 of tracks"}; DoubleProperty m_maxD0overSigmaD0 {this, "maxD0overSigmaD0", 3., "Maximum d0/sigmad0 of tracks"}; IntegerProperty m_numberOfPixelHits{this, "numberOfPixelHits",2};