diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
index 857b0e5630ef7fff1eb0fe10ee746bc717e43b24..4d4bc0dd2c0b7ca68fdd0228953e73bc04b2f057 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
@@ -1,68 +1,22 @@
-################################################################################
-# Package: TrigBjetHypo
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigBjetHypo )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthenaBaseComps
- Event/xAOD/xAODBase
- Event/xAOD/xAODTracking
- GaudiKernel
- Reconstruction/Particle
- Reconstruction/Jet/JetCalibTools
- Tracking/TrkEvent/VxSecVertex
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigSteer/TrigCompositeUtils
- Trigger/TrigTools/TrigInDetToolInterfaces
- Control/AthViews
- InnerDetector/InDetConditions/BeamSpotConditionsData
- PRIVATE
- Control/AthContainers
- Control/CxxUtils
- DetectorDescription/GeoPrimitives
- Event/EventInfo
- Event/EventPrimitives
- Event/FourMomUtils
- Event/xAOD/xAODBTagging
- Event/xAOD/xAODCore
- Event/xAOD/xAODJet
- Event/xAOD/xAODMuon
- Event/xAOD/xAODTrigger
- PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
- Reconstruction/Jet/JetEvent
- Tracking/TrkEvent/VxVertex
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigNavigation
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/DecisionHandling )
-
# External dependencies:
-find_package( Eigen )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS MathCore )
# Component(s) in the package:
atlas_add_component( TrigBjetHypo
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${EIGEN_LIBRARIES} AthenaBaseComps xAODBase xAODTracking GaudiKernel Particle VxSecVertex TrigInDetEvent TrigInterfacesLib AthContainers GeoPrimitives EventInfo EventPrimitives FourMomUtils xAODBTagging xAODCore xAODJet xAODMuon BTaggingLib JetEvent VxVertex TrigCaloEvent TrigMuonEvent TrigNavigationLib TrigParticle TrigSteeringEvent DecisionHandlingLib AthViews TrigCompositeUtilsLib )
+ INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${CLHEP_LIBRARIES} ${ROOT_LIBRARIES} AthContainers AthLinks AthViews AthenaBaseComps AthenaMonitoringKernelLib BTaggingLib BeamSpotConditionsData CxxUtils DecisionHandlingLib EventInfo EventPrimitives FourMomUtils GaudiKernel GeoPrimitives JetCalibToolsLib JetEvent Particle TrigCaloEvent TrigCompositeUtilsLib TrigInDetEvent TrigInterfacesLib TrigNavigationLib TrigParticle TrigSteeringEvent TrigInDetToolInterfacesLib VxSecVertex VxVertex xAODBTagging xAODBase xAODCore xAODJet xAODMuon xAODTracking xAODTrigger )
# Install files from the package:
-atlas_install_headers( TrigBjetHypo )
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
# Unit tests:
atlas_add_test( TrigBjetBtagHypoTool SCRIPT python -m TrigBjetHypo.TrigBjetBtagHypoTool
PROPERTIES TIMEOUT 300
POST_EXEC_SCRIPT nopost.sh )
-
-# Check Python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 --exclude='TrigBjetFexTuningGrade*' ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt
index 3fafa1b323eecd61c5f41742f7ed82ea9d7e9297..79b93f903ca1b180afaa6862d8d44aa3e981f6ce 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/CMakeLists.txt
@@ -1,32 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-################################################################################
-# Package: TrigMultiVarHypo
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMultiVarHypo )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/AthToolSupport/AsgTools
- Event/xAOD/xAODTrigCalo
- Event/xAOD/xAODTrigRinger
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigTimeAlgs
- PRIVATE
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils
- LumiBlock/LumiBlockComps
- Tools/PathResolver
- PRIVATE
- GaudiKernel
- Control/AthViews
- Control/AthContainers
- Control/AthenaMonitoringKernel
- )
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree )
# Component(s) in the package:
atlas_add_library( TrigMultiVarHypoLib
@@ -35,20 +13,12 @@ atlas_add_library( TrigMultiVarHypoLib
src/tools/procedures/*.cxx
src/tools/common/*.cxx
PUBLIC_HEADERS TrigMultiVarHypo
- LINK_LIBRARIES AsgTools xAODTrigCalo xAODTrigRinger TrigCaloEvent
- TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib
- DecisionHandlingLib LumiBlockCompsLib PathResolver
- AthenaMonitoringKernelLib TrigCompositeUtilsLib
- PRIVATE_LINK_LIBRARIES GaudiKernel AthViews )
-
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AsgTools AthenaMonitoringKernelLib GaudiKernel LumiBlockCompsLib PathResolver TrigCaloEvent TrigInterfacesLib TrigTimeAlgsLib xAODTrigCalo xAODTrigRinger )
-atlas_add_component( TrigMultiVarHypo
- src/components/*.cxx
- LINK_LIBRARIES AsgTools xAODTrigCalo xAODTrigRinger TrigCaloEvent
- TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib GaudiKernel
- TrigMultiVarHypoLib DecisionHandlingLib LumiBlockCompsLib TrigCompositeUtilsLib
- PathResolver AthenaMonitoringKernelLib)
+atlas_add_component( TrigMultiVarHypo
+ src/components/*.cxx
+ LINK_LIBRARIES TrigMultiVarHypoLib )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py
index e98178e5abe66a08b0be4bbdd404454973367745..5ec3e7409a897b79ac77cacc34993e7357d05219 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoConfig.py
@@ -1,16 +1,12 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Authors: joao victor pinto <jodafons@cern.ch>
from TrigMultiVarHypo.TrigMultiVarHypoConf import TrigL2CaloRingerFex, TrigL2CaloRingerHypo
from AthenaCommon.SystemOfUnits import GeV
from TrigMultiVarHypo.TrigL2CaloRingerHypoTool import _GetPath
-from TrigMultiVarHypo.TrigL2CaloRingerHypoMonitoring import TrigL2CaloRingerHypoValidationMonitoring, \
- TrigL2CaloRingerHypoOnlineMonitoring,\
- TrigL2CaloRingerHypoTimeMonitoring,\
- TrigL2CaloRingerFexTimeMonitoring
-
+
# Call all Trigger Ringer Fast configurations here!
class TrigL2CaloRingerFexBase( TrigL2CaloRingerFex ):
@@ -21,10 +17,6 @@ class TrigL2CaloRingerFexBase( TrigL2CaloRingerFex ):
self.HltFeature = "TrigRingerNeuralFex"
self.Feature = "TrigT2CaloEgamma"
- #time = TrigL2CaloRingerFexTimeMonitoring()
- #self.AthenaMonTools = [ time ]
- #self.doTiming = True
-
# The multi layer perceptron and preprocessing step is called by
# Fex because we store the output network. So to complete the trigger
@@ -34,7 +26,6 @@ class TrigL2CaloRingerFex( TrigL2CaloRingerFexBase ):
def __init__(self, name, threshold, IDinfo, trigType):
super( TrigL2CaloRingerFex, self ).__init__( name )
- from AthenaCommon.AppMgr import ToolSvc
from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgOnlineDefault
LuminosityCondAlgOnlineDefault()
pconstants,pthresholds=_GetPath(trigType,IDinfo)
@@ -91,12 +82,6 @@ class TrigL2CaloRingerHypo_g_ID(TrigL2CaloRingerHypo):
self.EmEtCut = (float(threshold) - 3)*GeV
pconstants,pthresholds=_GetPath(trigType,IDinfo)
self.CalibPath = pthresholds
- #validation = TrigL2CaloRingerHypoValidationMonitoring()
- #online = TrigL2CaloRingerHypoOnlineMonitoring()
- #time = TrigL2CaloRingerHypoTimeMonitoring()
- #self.AthenaMonTools = [ time, validation, online ]
- #self.doTiming = True
-
class TrigL2CaloRingerHypo_NoCut(TrigL2CaloRingerHypo):
@@ -106,11 +91,6 @@ class TrigL2CaloRingerHypo_NoCut(TrigL2CaloRingerHypo):
super( TrigL2CaloRingerHypo_NoCut, self ).__init__( name )
self.HltFeature = 'TrigRingerNeuralFex'
self.AcceptAll = True
- #validation = TrigL2CaloRingerHypoValidationMonitoring()
- #online = TrigL2CaloRingerHypoOnlineMonitoring()
- #time = TrigL2CaloRingerHypoTimeMonitoring()
- #self.AthenaMonTools = [ time, validation, online ]
- #self.doTiming = True
class TrigL2CaloRingerHypo_EtCut(TrigL2CaloRingerHypo):
@@ -121,13 +101,6 @@ class TrigL2CaloRingerHypo_EtCut(TrigL2CaloRingerHypo):
self.HltFeature = 'TrigRingerNeuralFex'
self.AcceptAll = False
self.EmEtCut = (float(threshold) - 3)*GeV
- #validation = TrigL2CaloRingerHypoValidationMonitoring()
- #online = TrigL2CaloRingerHypoOnlineMonitoring()
- #time = TrigL2CaloRingerHypoTimeMonitoring()
- #self.AthenaMonTools = [ time, validation, online ]
- #self.doTiming = True
-
-
#helper function for combined
diff --git a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py
index 49d6b4a3bf2baef496c73f61e3235ff1311f1c2a..168c8484fbe865daf281c2219fad0ff820b9a5f4 100644
--- a/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigMultiVarHypo/python/TrigL2CaloRingerHypoTool.py
@@ -1,16 +1,15 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
from __future__ import print_function
import re
-_pattern = "(?P<mult>\d*)(e(?P<threshold1>\d+))(e(?P<threshold2>\d+))*"
+_pattern = r"(?P<mult>\d*)(e(?P<threshold1>\d+))(e(?P<threshold2>\d+))*"
_cpattern = re.compile( _pattern )
_possibleSel = { 'tight':'Tight', 'medium':'Medium', 'loose':'Loose', 'vloose':'VeryLoose',
'lhtight':'Tight', 'lhmedium':'Medium', 'lhloose':'Loose', 'lhvloose':'VeryLoose'}
from AthenaCommon.SystemOfUnits import GeV
-from TriggerJobOpts.TriggerFlags import TriggerFlags
#from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool,defineHistogram
# Just because the TriggerFlags Online and doValidation doen't work
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
@@ -24,7 +23,7 @@ def _GetPath( cand, sel, basepath = 'RingerSelectorTools/TrigL2_20180903_v9' ):
if EgammaSliceFlags.ringerVersion():
basepath = EgammaSliceFlags.ringerVersion()
logger.info('TrigMultiVarHypo version: %s', basepath)
- if not sel in _possibleSel.keys():
+ if sel not in _possibleSel.keys():
raise RuntimeError( "Bad selection name: %s" % sel )
if 'e' in cand:
constant = basepath+'/'+ 'TrigL2CaloRingerElectron{SEL}Constants.root'.format(SEL=_possibleSel[sel])
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt b/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt
index d171de37b57722cde47ae20fc95198a3a787effa..24e0e8cee7ce2e465931b59e7e5495248f9d760e 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/CMakeLists.txt
@@ -1,42 +1,18 @@
-################################################################################
-# Package: TrigMuonHypoMT
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigMuonHypoMT )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Event/xAOD/xAODTrigMuon
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils
- Control/AthViews
- PRIVATE
- Trigger/TrigT1/TrigT1Interfaces
- Control/AthenaMonitoringKernel
- Event/xAOD/xAODMuon
- PhysicsAnalysis/Interfaces/MuonAnalysisInterfaces
- GaudiKernel )
-
-# External dependencies:
-find_package( CLHEP )
-
# Component(s) in the package:
atlas_add_component( TrigMuonHypoMT
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
- LINK_LIBRARIES ${CLHEP_LIBRARIES} xAODTrigMuon TrigInterfacesLib DecisionHandlingLib TrigCompositeUtilsLib AthViews xAODMuon GaudiKernel TrigT1Interfaces AthenaMonitoringKernelLib )
+ LINK_LIBRARIES AthLinks AthViews AthenaBaseComps AthenaMonitoringKernelLib CxxUtils DecisionHandlingLib GaudiKernel MuonAnalysisInterfacesLib StoreGateLib TrigCompositeUtilsLib TrigSteeringEvent TrigT1Interfaces xAODMuon xAODTrigMuon )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
# Unit tests:
atlas_add_test( TrigMuonHypoMTConfig
SCRIPT python -m TrigMuonHypoMT.TrigMuonHypoMTConfig
POST_EXEC_SCRIPT nopost.sh )
-
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx
index 55cf1e468512a4e0b21ea3b04689686e68e858cb..4ec3e3bfef20b00b6ac778bf0fc66c19b7642b71 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigL2MuonOverlapRemoverTool.cxx
@@ -2,9 +2,13 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#include "GaudiKernel/SystemOfUnits.h"
#include "AthenaMonitoringKernel/Monitored.h"
+#include "CxxUtils/phihelper.h"
+
#include "TrigL2MuonOverlapRemoverTool.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+
+#include <cmath>
using namespace TrigCompositeUtils;
// --------------------------------------------------------------------------------
@@ -381,11 +385,9 @@ bool TrigL2MuonOverlapRemoverTool::isOverlap(const xAOD::L2StandAloneMuon *mf1,
double TrigL2MuonOverlapRemoverTool::dR(double eta1, double phi1, double eta2, double phi2) const
{
- double deta = eta1 - eta2;
- double dphi = fabs(phi1 - phi2);
- if( dphi > CLHEP::pi ) dphi = CLHEP::twopi - dphi;
- double dR = pow( (deta*deta + dphi*dphi), 0.5 );
- return dR;
+ const double deta = eta1 - eta2;
+ const double dphi = CxxUtils::deltaPhi(phi1, phi2);
+ return std::sqrt(deta*deta + dphi*dphi);
}
// --------------------------------------------------------------------------------
@@ -668,8 +670,8 @@ bool TrigL2MuonOverlapRemoverTool::isOverlap(const xAOD::L2CombinedMuon *combMf1
auto monitorIt = Monitored::Group(m_monTool, mucombDR, mucombMass, mucombDRLog10, mucombMassLog10);
- ATH_MSG_DEBUG( " ...mF1: pt/eta/phi=" << combMf1->pt()/CLHEP::GeV << " / " << combMf1->eta() << " / " << combMf1->phi() );
- ATH_MSG_DEBUG( " ...mF2: pt/eta/phi=" << combMf2->pt()/CLHEP::GeV << " / " << combMf2->eta() << " / " << combMf2->phi() );
+ ATH_MSG_DEBUG( " ...mF1: pt/eta/phi=" << combMf1->pt()/Gaudi::Units::GeV << " / " << combMf1->eta() << " / " << combMf1->phi() );
+ ATH_MSG_DEBUG( " ...mF2: pt/eta/phi=" << combMf2->pt()/Gaudi::Units::GeV << " / " << combMf2->eta() << " / " << combMf2->phi() );
// if dR or invMass is necessary but (eta,phi) info is not avaiable
// (i.e. eta,phi=0,0; rec failed)
@@ -750,7 +752,7 @@ bool TrigL2MuonOverlapRemoverTool::isOverlap(const xAOD::L2CombinedMuon *combMf1
// mass cut
const double TRACK_MASS = 0; // just assume zero mass
bool massIsClose = false;
- double mass = invMass(TRACK_MASS,combMf1->pt()/CLHEP::GeV,combMf1->eta(),combMf1->phi(),TRACK_MASS,combMf2->pt()/CLHEP::GeV,combMf2->eta(),combMf2->phi());
+ double mass = invMass(TRACK_MASS,combMf1->pt()/Gaudi::Units::GeV,combMf1->eta(),combMf1->phi(),TRACK_MASS,combMf2->pt()/Gaudi::Units::GeV,combMf2->eta(),combMf2->phi());
mucombMass = mass;
double mass_mon = (mass>=monitor_limit) ? mass : monitor_limit;
@@ -819,7 +821,7 @@ void TrigL2MuonOverlapRemoverTool::chooseBestMuon(std::vector<L2CBMuonOverlapInf
float ptCombMf = 0.;
const xAOD::L2CombinedMuon* combMf = toolInput[j].overlap;
- ptCombMf = fabs(combMf->pt()/CLHEP::GeV);
+ ptCombMf = fabs(combMf->pt()/Gaudi::Units::GeV);
ATH_MSG_DEBUG(" j="<< j << " , ptCombMf=" << ptCombMf);
if( ptCombMf > maxPtCombMf ) {
maxPtCombMf = ptCombMf;
@@ -836,7 +838,7 @@ void TrigL2MuonOverlapRemoverTool::chooseBestMuon(std::vector<L2CBMuonOverlapInf
// monitoring
const xAOD::L2CombinedMuon* CombMf = toolInput[j].overlap;
mucombNrOverlapped++;
- mucombOverlappedPt = CombMf->pt()* CombMf->charge() /CLHEP::GeV;
+ mucombOverlappedPt = CombMf->pt()* CombMf->charge() /Gaudi::Units::GeV;
mucombOverlappedEta = CombMf->eta();
mucombOverlappedPhi = CombMf->phi();
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
index 10243683ab59ed08434490b9e27069257409424c..f34f21fd7ec24c1fc8ef0a42a7b1a82e10b1fa93 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AthenaMonitoringKernel/Monitored.h"
@@ -53,12 +53,12 @@ StatusCode TrigMufastHypoTool::initialize()
sprintf(buf1,"%f5.2",m_ptBins[j][i]);
sprintf(buf2,"%f5.2",m_ptBins[j][i+1]);
ATH_MSG_DEBUG("EtaBin[" << j << "] " << buf1 << " - " << buf2
- << ": with Pt Threshold of " << (m_ptThresholds[j][i])/CLHEP::GeV
+ << ": with Pt Threshold of " << (m_ptThresholds[j][i])/Gaudi::Units::GeV
<< " GeV");
}
- ATH_MSG_DEBUG("Endcap WeakBField A[" << j << "]: pT threshold of " << m_ptThresholdForECWeakBRegionA[j] / CLHEP::GeV << " GeV");
- ATH_MSG_DEBUG("Endcap WeakBField B[" << j << "]: pT threshold of " << m_ptThresholdForECWeakBRegionB[j] / CLHEP::GeV << " GeV");
+ ATH_MSG_DEBUG("Endcap WeakBField A[" << j << "]: pT threshold of " << m_ptThresholdForECWeakBRegionA[j] / Gaudi::Units::GeV << " GeV");
+ ATH_MSG_DEBUG("Endcap WeakBField B[" << j << "]: pT threshold of " << m_ptThresholdForECWeakBRegionB[j] / Gaudi::Units::GeV << " GeV");
}
}
@@ -173,11 +173,11 @@ bool TrigMufastHypoTool::decideOnSingleObject(TrigMufastHypoTool::MuonClusterInf
threshold = m_ptThresholdForECWeakBRegionB[cutIndex];
}
- ATH_MSG_DEBUG("threshold value is set as: " << threshold/CLHEP::GeV << " GeV");
+ ATH_MSG_DEBUG("threshold value is set as: " << threshold/Gaudi::Units::GeV << " GeV");
// Check pt threshold for hypothesis,
// convert units since Muonfeature is in GeV
- if ( std::abs(pMuon->pt()) > (threshold/CLHEP::GeV)){
+ if ( std::abs(pMuon->pt()) > (threshold/Gaudi::Units::GeV)){
// selects only tracks coming from a region around PV
if( m_selectPV ){
if((fabs(xatBeam)<m_RPV) && (fabs(zatBeam)<m_ZPV))
@@ -190,39 +190,12 @@ bool TrigMufastHypoTool::decideOnSingleObject(TrigMufastHypoTool::MuonClusterInf
if ( result ) fexPtFL = -9999.;
ATH_MSG_DEBUG("REGTEST: Muon pt is " << pMuon->pt() << " GeV"
- << " and threshold cut is " << threshold/CLHEP::GeV << " GeV"
+ << " and threshold cut is " << threshold/Gaudi::Units::GeV << " GeV"
<< " so hypothesis is " << (result?"true":"false"));
return result;
}
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
-/*
-TrigMufastHypoToolConsts::ECRegions TrigMufastHypoTool::whichECRegion( const float eta, const float phi ) const
-{
- float absEta = fabs(eta);
-
- if( ( 1.3 <= absEta && absEta < 1.45) &&
- ( (0 <= fabs(phi) && fabs(phi) < CLHEP::pi/48. ) ||
- (CLHEP::pi*11./48. <= fabs(phi) && fabs(phi) < CLHEP::pi*13./48. ) ||
- (CLHEP::pi*23./48. <= fabs(phi) && fabs(phi) < CLHEP::pi*25./48. ) ||
- (CLHEP::pi*35./48. <= fabs(phi) && fabs(phi) < CLHEP::pi*37./48. ) ||
- (CLHEP::pi*47./48. <= fabs(phi) && fabs(phi) < CLHEP::pi )
- )
- ) return TrigMufastHypoToolConsts::WeakBFieldA;
-
- else if( ( 1.5 <= absEta && absEta < 1.65 ) &&
- ( (CLHEP::pi*3./32. <= fabs(phi) && fabs(phi) < CLHEP::pi*5./32. ) ||
- (CLHEP::pi*11./32. <= fabs(phi) && fabs(phi) < CLHEP::pi*13./32.) ||
- (CLHEP::pi*19./32. <= fabs(phi) && fabs(phi) < CLHEP::pi*21./32.) ||
- (CLHEP::pi*27./32. <= fabs(phi) && fabs(phi) < CLHEP::pi*29./32.)
- )
- ) return TrigMufastHypoToolConsts::WeakBFieldB;
-
- else return TrigMufastHypoToolConsts::Bulk;
-}
-*/
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
index 3bdc00f60e4eafc960be972095df0d64b36e8fae..d99a7edc518859030bc72a92e3d4342e7f5dca8d 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMufastHypoTool.h
@@ -1,12 +1,12 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUONHYPOMT_TRIGMUFASTHYPOTOOL_H
#define TRIGMUONHYPOMT_TRIGMUFASTHYPOTOOL_H 1
#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "xAODTrigMuon/L2StandAloneMuonContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
@@ -70,14 +70,13 @@ class TrigMufastHypoTool: public ::AthAlgTool {
StatusCode multiplicitySelection(std::vector<TrigMufastHypoTool::MuonClusterInfo>& toolInput) const;
float getLocalPhi(float, float, float) const;
- //TrigMufastHypoToolConsts::ECRegions whichECRegion(const float eta, const float phi) const;
-
+
// Properties:
Gaudi::Property< std::vector<std::vector<double>> > m_ptBins {
this, "PtBins", { {0, 2.5} }, "Bins range of each pT threshold" };
Gaudi::Property< std::vector<std::vector<double>> > m_ptThresholds {
- this, "PtThresholds", { {5.49*CLHEP::GeV} }, "Track pT requirement ( separate threshold for each muon )" };
+ this, "PtThresholds", { {5.49*Gaudi::Units::GeV} }, "Track pT requirement ( separate threshold for each muon )" };
Gaudi::Property< bool > m_acceptAll {
this, "AcceptAll", false, "Ignore selection" };
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx
index 2008143f11be445c886bde0c1d104bf08696045b..6b55470ccb83038178c15c647fe30139785009c2 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuisoHypoTool.cxx
@@ -1,10 +1,10 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AthenaMonitoringKernel/Monitored.h"
#include "TrigMuisoHypoTool.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
using namespace TrigCompositeUtils;
// --------------------------------------------------------------------------------
@@ -77,7 +77,7 @@ bool TrigMuisoHypoTool::decideOnSingleObject( TrigMuisoHypoTool::MuisoInfo& inpu
float etamu = pMuonIso->eta();
float ptmu = fabs(pMuonIso->pt());
- sumPtCone = ptsum / CLHEP::GeV;
+ sumPtCone = ptsum / Gaudi::Units::GeV;
float isoID = 0.0;
if (ptmu > 0) isoID = ptsum/ptmu;
@@ -102,7 +102,7 @@ bool TrigMuisoHypoTool::decideOnSingleObject( TrigMuisoHypoTool::MuisoInfo& inpu
result = isIsolatedID;
ATH_MSG_DEBUG( " REGTEST pt / eta / SumPtCone / isoID : "
- << " / " << ptmu / CLHEP::GeV
+ << " / " << ptmu / Gaudi::Units::GeV
<< " / " << etamu
<< " / " << sumPtCone
<< " / " << isoID
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.cxx
index 296a94da94c60bc3d8688aa166c125f3232c023d..e7a7c0580934d4225e1aca1ca2c7b78e7c115354 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.cxx
@@ -2,6 +2,8 @@
Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
+#include "GaudiKernel/SystemOfUnits.h"
+
#include "TrigCompositeUtils/Combinators.h"
#include "TrigMuonEFHypoTool.h"
#include "AthenaMonitoringKernel/Monitored.h"
@@ -36,7 +38,7 @@ StatusCode TrigMuonEFHypoTool::initialize(){
return StatusCode::FAILURE;
}
for (std::vector<float>::size_type i=0; i<m_bins[j];++i) {
- ATH_MSG_INFO( "bin " << m_ptBins[j][i] << " - " << m_ptBins[j][i+1]<<" with Pt Threshold of " << (m_ptThresholds[j][i])/CLHEP::GeV<< " GeV");
+ ATH_MSG_INFO( "bin " << m_ptBins[j][i] << " - " << m_ptBins[j][i+1]<<" with Pt Threshold of " << (m_ptThresholds[j][i])/Gaudi::Units::GeV<< " GeV");
}
}
}
@@ -92,9 +94,9 @@ bool TrigMuonEFHypoTool::decideOnSingleObject(TrigMuonEFHypoTool::MuonEFInfo& in
if (!tr) {
ATH_MSG_DEBUG("No TrackParticle found.");
} else {
- ATH_MSG_DEBUG("Retrieved Track track with abs pt "<< (*tr).pt()/CLHEP::GeV << " GeV ");
+ ATH_MSG_DEBUG("Retrieved Track track with abs pt "<< (*tr).pt()/Gaudi::Units::GeV << " GeV ");
//fill monitored variables
- fexPt.push_back(tr->pt()/CLHEP::GeV);
+ fexPt.push_back(tr->pt()/Gaudi::Units::GeV);
fexEta.push_back(tr->eta());
fexPhi.push_back(tr->phi());
//Apply hypo cuts
@@ -103,17 +105,17 @@ bool TrigMuonEFHypoTool::decideOnSingleObject(TrigMuonEFHypoTool::MuonEFInfo& in
for (std::vector<float>::size_type k=0; k<m_bins[0]; ++k) {
if (absEta > m_ptBins[cutIndex][k] && absEta <= m_ptBins[cutIndex][k+1]) threshold = m_ptThresholds[cutIndex][k];
}
- if (std::abs(tr->pt())/CLHEP::GeV > (threshold/CLHEP::GeV)){
- selPt.push_back(tr->pt()/CLHEP::GeV);
+ if (std::abs(tr->pt())/Gaudi::Units::GeV > (threshold/Gaudi::Units::GeV)){
+ selPt.push_back(tr->pt()/Gaudi::Units::GeV);
selEta.push_back(tr->eta());
selPhi.push_back(tr->phi());
result = true;
// If trigger path name includes "muonqual", check whether the muon passes those criteria
if(m_muonqualityCut == true) result = passedQualityCuts(muon);
}
- ATH_MSG_DEBUG(" REGTEST muon pt is " << tr->pt()/CLHEP::GeV << " GeV "
+ ATH_MSG_DEBUG(" REGTEST muon pt is " << tr->pt()/Gaudi::Units::GeV << " GeV "
<< " with Charge " << tr->charge()
- << " and threshold cut is " << threshold/CLHEP::GeV << " GeV"
+ << " and threshold cut is " << threshold/Gaudi::Units::GeV << " GeV"
<< " so hypothesis is " << (result?"true":"false"));
}
}
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.h
index 66bc01103c33bfe5a626a7f12a9b242140e8459b..b21ba56d6fd09d7fe4114c2c6ebb6daeb27cc9b6 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFHypoTool.h
@@ -8,7 +8,7 @@
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
#include "xAODMuon/MuonContainer.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
// include Muon SelectionTool for quality criteria
#include "MuonAnalysisInterfaces/IMuonSelectionTool.h"
@@ -52,7 +52,7 @@ class TrigMuonEFHypoTool: public ::AthAlgTool {
Gaudi::Property< std::vector<std::vector<double>> > m_ptBins {
this, "PtBins", { {0, 2.5} }, "Bins range of each pT threshold" };
Gaudi::Property< std::vector<std::vector<double>> > m_ptThresholds {
- this, "PtThresholds", { {5.49*CLHEP::GeV} }, "Track pT requirement ( separate threshold for each muon )" };
+ this, "PtThresholds", { {5.49*Gaudi::Units::GeV} }, "Track pT requirement ( separate threshold for each muon )" };
Gaudi::Property< bool > m_acceptAll {
this, "AcceptAll", false, "Ignore selection" };
Gaudi::Property<bool> m_decisionPerRoI {
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx
index a0fc027bb1b4c2014764de1affba1edef647861a..4e5b030bc25f560401fe520f3040b9dbf0e05c01 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigMuonEFInvMassHypoTool.cxx
@@ -3,7 +3,7 @@
*/
#include "TrigMuonEFInvMassHypoTool.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "AthenaMonitoringKernel/Monitored.h"
#include "xAODMuon/MuonContainer.h"
@@ -75,9 +75,9 @@ bool TrigMuonEFInvMassHypoTool::executeAlg(std::vector<LegDecision> &combination
if (!tr1 || !tr2) {
ATH_MSG_DEBUG("No CombinedTrackParticle found.");
} else {
- ATH_MSG_DEBUG("Retrieved CombinedTrack tracks with abs pt "<< (*tr1).pt()/CLHEP::GeV << " GeV and "<< (*tr2).pt()/CLHEP::GeV << " GeV ");
+ ATH_MSG_DEBUG("Retrieved CombinedTrack tracks with abs pt "<< (*tr1).pt()/Gaudi::Units::GeV << " GeV and "<< (*tr2).pt()/Gaudi::Units::GeV << " GeV ");
- float diMuMass = (tr1->p4()+tr2->p4()).M()/CLHEP::GeV;
+ float diMuMass = (tr1->p4()+tr2->p4()).M()/Gaudi::Units::GeV;
//fill monitored variables
fexInvMass.push_back(diMuMass);
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
index 1452992f2b32219cd9ef4736748acd1b6e33a7fa..241fdda0aabfb10e8084b77e1040aeacd77a2ebd 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "AthenaMonitoringKernel/Monitored.h"
@@ -44,7 +44,7 @@ StatusCode TrigmuCombHypoTool::initialize()
for (std::vector<float>::size_type i = 0; i < m_bins[j]; ++i) {
ATH_MSG_INFO("bin[" << j << "] " << m_ptBins[j][i] << " - " << m_ptBins[j][i + 1]
- << " with Pt Threshold of " << (m_ptThresholds[j][i]) / CLHEP::GeV << " GeV");
+ << " with Pt Threshold of " << (m_ptThresholds[j][i]) / Gaudi::Units::GeV << " GeV");
}
}
}
@@ -95,14 +95,14 @@ bool TrigmuCombHypoTool::decideOnSingleObject(TrigmuCombHypoTool::CombinedMuonIn
return result;
}
- auto ptValue = pMuon->pt() * pMuon->charge() / CLHEP::GeV;
+ auto ptValue = pMuon->pt() * pMuon->charge() / Gaudi::Units::GeV;
fexPt = ptValue;
ptFL = ptValue;
idEta = pMuon->eta();
idPhi = pMuon->phi();
int usealgo = pMuon->strategy();
- float ptresComb = pMuon->sigmaPt() / CLHEP::GeV;
+ float ptresComb = pMuon->sigmaPt() / Gaudi::Units::GeV;
Strategy = usealgo;
ATH_MSG_DEBUG("combined muon pt (GeV)/ sigma_pt (GeV)/ eta / phi / usedalgo: "
<< fexPt << " (GeV) / " << ptresComb << " (GeV) / " << idEta << " / " << idPhi
@@ -149,9 +149,9 @@ bool TrigmuCombHypoTool::decideOnSingleObject(TrigmuCombHypoTool::CombinedMuonIn
//Std Pt cut
bool stdCut = true;
- if (std::abs(fexPt) <= (threshold / CLHEP::GeV)) stdCut = false;
+ if (std::abs(fexPt) <= (threshold / Gaudi::Units::GeV)) stdCut = false;
ATH_MSG_DEBUG("REGTEST muon pt is " << fexPt
- << " GeV and threshold cut is " << threshold / CLHEP::GeV
+ << " GeV and threshold cut is " << threshold / Gaudi::Units::GeV
<< " GeV and pik_cut is " << (pikCut ? "true" : "false"));
//Strategy dependent Pt cuts
diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
index e0d3d1b1bbdf6fe3d903de5cb3049a9790f184fc..10ea1ae595bc4c48e1c62658c931046a0edf4c12 100644
--- a/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/src/TrigmuCombHypoTool.h
@@ -1,12 +1,12 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGMUONHYPOMT_TRIGMUCOMBHYPOTOOL_H
#define TRIGMUONHYPOMT_TRIGMUCOMBHYPOTOOL_H 1
#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "xAODTrigMuon/L2CombinedMuonContainer.h"
@@ -71,7 +71,7 @@ class TrigmuCombHypoTool: public ::AthAlgTool {
this, "PtBins", { {0, 2.5} }, "Bins range of each pT threshold" };
Gaudi::Property< std::vector<std::vector<double>> > m_ptThresholds {
- this, "PtThresholds", { {5.83 * CLHEP::GeV} }, "Track pT requirement ( separate threshold for each muon )" };
+ this, "PtThresholds", { {5.83 * Gaudi::Units::GeV} }, "Track pT requirement ( separate threshold for each muon )" };
Gaudi::Property< bool > m_acceptAll {
this, "AcceptAll", false, "Ignore selection" };
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt
index 6d12d57770d0d9ef2c44e11c0e94101a0822d26c..98744112fb095822121e78da8657ba0e7f25a07a 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigTauHypo/CMakeLists.txt
@@ -1,60 +1,16 @@
-################################################################################
-# Package: TrigTauHypo
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigTauHypo )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Control/StoreGate
- Control/AthenaBaseComps
- GaudiKernel
- Reconstruction/MuonIdentification/MuidEvent
- Reconstruction/Particle
- Reconstruction/RecoTools/ITrackToVertex
- Reconstruction/egamma/egammaEvent
- Reconstruction/tauEvent
- Tracking/TrkEvent/VxVertex
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigParticle
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigEvent/TrigTopoEvent
- Trigger/TrigSteer/TrigInterfaces
- Event/xAOD/xAODTrigger
- Calorimeter/CaloEvent
- Control/AthViews
- Control/AthContainers
- Control/CxxUtils
- Event/EventInfo
- Event/xAOD/xAODCaloEvent
- Event/xAOD/xAODJet
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTau
- Event/xAOD/xAODTracking
- Tools/PathResolver
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTrackSummary
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigNavStructure
- Trigger/TrigSteer/DecisionHandling
- Trigger/TrigSteer/TrigCompositeUtils )
-
# External dependencies:
-find_package( CLHEP )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core TMathCore Hist )
# Component(s) in the package:
atlas_add_component( TrigTauHypo
src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} StoreGateLib SGtests GaudiKernel MuidEvent Particle ITrackToVertex egammaEvent tauEvent VxVertex TrigInDetEvent TrigMuonEvent TrigParticle TrigSteeringEvent TrigTopoEvent TrigInterfacesLib CaloEvent AthContainers AthenaBaseComps EventInfo xAODCaloEvent xAODJet xAODTau xAODEgamma xAODTracking PathResolver TrkTrack TrkTrackSummary TrigCaloEvent TrigNavStructure DecisionHandlingLib AthViews TrigCompositeUtilsLib )
+ LINK_LIBRARIES ${ROOT_LIBRARIES} AthContainers AthViews AthenaBaseComps AthenaMonitoringKernelLib CaloEvent CxxUtils DecisionHandlingLib EventInfo GaudiKernel ITrackToVertex MuidEvent Particle PathResolver StoreGateLib TrigCaloEvent TrigCompositeUtilsLib TrigInDetEvent TrigInterfacesLib TrigMuonEvent TrigNavStructure TrigParticle TrigSteeringEvent TrigTopoEvent TrkTrack TrkTrackSummary VxVertex egammaEvent tauEvent xAODBase xAODCaloEvent xAODEgamma xAODJet xAODMuon xAODTau xAODTracking xAODTrigger )
# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
-# Check python syntax:
-atlas_add_test( flake8
- SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/python
- POST_EXEC_SCRIPT nopost.sh )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/doc/packagedoc.h b/Trigger/TrigHypothesis/TrigTauHypo/doc/packagedoc.h
deleted file mode 100644
index 261effc9c7a20679e30f027b8a5caa27527e1477..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigTauHypo/doc/packagedoc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-
-@page TrigTauHypo_page
-@author Stefania Xella
-@author M. Pilar Casado
-@author Olga Igonkina
-
-@section TrigTauHypo_MyPackageOverview Overview
-This package contains HLT variables to select taus in LVL2 and EF.
-Tracking and calorimeter information is used to select a narrow jet with
-low multiplicity.
-
-
-*/
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx
index c70cd0dfd1043657e0485ba479a15608dc14b21b..cf9d4cba82b0bc05b141741cabf0ee27cae22cc5 100644
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/EFHadCalibHypo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
@@ -8,6 +8,7 @@
//
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/ListItem.h"
+#include "GaudiKernel/SystemOfUnits.h"
//
#include "EFHadCalibHypo.h"
//
@@ -28,12 +29,12 @@ EFHadCalibHypo::EFHadCalibHypo(const std::string& name,
{
// cuts on quality of high pt tracks (HT)
- declareProperty("CutOnPtHT" , m_PtMinCut = 0.0*CLHEP::GeV );
+ declareProperty("CutOnPtHT" , m_PtMinCut = 0.0*Gaudi::Units::GeV );
declareProperty("CutOnEtaHT" , m_maxEta = 10.0 );
declareProperty("CutminSCTHitsHT" , m_minSCTHits = -1 );
declareProperty("CutminPixHitsHT" , m_minPixHits = -1 );
- declareProperty("CutmaxD0HT" , m_maxD0 = 9999.9*CLHEP::mm );
- declareProperty("CutmaxZ0HT" , m_maxZ0 = 9999.9*CLHEP::mm );
+ declareProperty("CutmaxD0HT" , m_maxD0 = 9999.9*Gaudi::Units::mm );
+ declareProperty("CutmaxZ0HT" , m_maxZ0 = 9999.9*Gaudi::Units::mm );
declareProperty("CutOnIsolationDeltaR" , m_trackIsoDR = 0.0 );
declareProperty("CutnTracksOnDeltaR" , m_nMaxTracksOnDeltaR = 99);
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/EFTauInvHypo.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/EFTauInvHypo.cxx
index 78a2129efd813623224fcb9bd230fbb6c856f58d..aa95c8bbfaf82ee7bfe76472da1f8cc43748bbe0 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/EFTauInvHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/EFTauInvHypo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
// ********************************************************************
@@ -19,6 +19,7 @@
//
#include "GaudiKernel/StatusCode.h"
#include "GaudiKernel/ListItem.h"
+#include "GaudiKernel/SystemOfUnits.h"
//
#include "EFTauInvHypo.h"
//
@@ -51,7 +52,7 @@ EFTauInvHypo::EFTauInvHypo(const std::string& name,
declareProperty("NTrkOnly1or3",m_numTrkOnly1or3 = false);
declareProperty("EMRadiusMax_1P",m_EMRadiusMax_1P = 100.);
declareProperty("EMRadiusMax_MP",m_EMRadiusMax_MP = 100.);
- declareProperty("EtCalibMin",m_EtCalibMin = -10.0*CLHEP::GeV);
+ declareProperty("EtCalibMin",m_EtCalibMin = -10.0*Gaudi::Units::GeV);
declareProperty("DrTrkAvgMax_1P",m_DrTrkAvgMax_1P = 100.);
declareProperty("DrTrkAvgMax_MP",m_DrTrkAvgMax_MP = 100.);
declareProperty("EtovPtLeadMax_1P",m_EtovPtLeadMax_1P = 100.);
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDCoreTauHypo.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDCoreTauHypo.cxx
index 162eb09d45546e74c2620157df5561501e2c3176..2fdf9f0377a3f48776c808b5f26c85fb8f2b7506 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDCoreTauHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDCoreTauHypo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//----------------------------------------
@@ -11,6 +11,8 @@
//----------------------------------------
#include <math.h>
+#include "GaudiKernel/SystemOfUnits.h"
+
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "TrigInDetEvent/TrigTauTracksInfo.h"
#include "T2IDCoreTauHypo.h"
@@ -37,7 +39,7 @@ T2IDCoreTauHypo::T2IDCoreTauHypo(const std::string& name, ISvcLocator* pSvcLocat
// Cut on maximum number of tracks Ntrk <= NtrkMaxCut
declareProperty("NTrkMax", m_nTrkMax_Cut = -1 );
// Cut for minimum leading track Pt
- declareProperty("LdTrkPtMin", m_ldTrkPt_Cut = -9999.9 *CLHEP::GeV ); //disabled by default
+ declareProperty("LdTrkPtMin", m_ldTrkPt_Cut = -9999.9 *Gaudi::Units::GeV ); //disabled by default
// Cut counter
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDTauHypo.cxx b/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDTauHypo.cxx
index b9abf161a506841a2f8ca9d465c508eab027bc33..7ccd3ac9f598b8aeb8c0fef20023835e0cada1fb 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDTauHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/T2IDTauHypo.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
//----------------------------------------
@@ -9,6 +9,8 @@
//----------------------------------------
#include <math.h>
+#include "GaudiKernel/SystemOfUnits.h"
+
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
#include "TrigInDetEvent/TrigTauTracksInfo.h"
#include "T2IDTauHypo.h"
@@ -47,7 +49,7 @@ T2IDTauHypo::T2IDTauHypo(const std::string& name, ISvcLocator* pSvcLocator):
declareProperty("SumPtRatioMaxMP", m_prop_sumPtRatio_MPCut = 9999.9 );//disabled by default
/** leading track pt, used by HadCalib chains in 2011 */
- declareProperty("LdTrkPtMin", m_ldTrkPt_Cut = -9999.9 *CLHEP::GeV ); //disabled by default
+ declareProperty("LdTrkPtMin", m_ldTrkPt_Cut = -9999.9 *Gaudi::Units::GeV ); //disabled by default
/** Cut counter */
declareMonitoredVariable("CutCounter", m_cutCounter);
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
index a5cc85f242d1dede315c512d77806f2b1dee98c8..fa7ae61a432a7cb7154e899397fb7fa3481ab00a 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTauGenericHypoMT.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TrigTauGenericHypoMT_H
@@ -25,7 +25,6 @@
#include "GaudiKernel/Property.h"
-#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauJetContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
diff --git a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
index 8aab6eb645d9d5b8c6a3df1dbd09742c178de189..edceb95e28006bf228a68f49e0d9face661a9185 100755
--- a/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigTauHypo/src/TrigTrackPreSelHypoTool.h
@@ -1,12 +1,11 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TrigTrackPreSelHypoTool_H
#define TrigTrackPreSelHypoTool_H
#include "GaudiKernel/Property.h"
-#include "CLHEP/Units/SystemOfUnits.h"
#include "xAODTau/TauJet.h"
#include "xAODTau/TauJetContainer.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"