From 70f7887fa78fc680f15ab2230d745c32649063b2 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 8 Jul 2020 15:33:23 +0200
Subject: [PATCH] TrigLongLivedParticlesHypo: Package cleanup
- cleanup cmake configuration and link dependencies
- remove CLHEP dependency
- enable flake8
- delete obsolete job options
---
.../TrigLongLivedParticlesHypo/CMakeLists.txt | 32 +++----------------
.../MuonClusterHypo.h | 0
.../MuonClusterIsolationHypo.h | 0
.../TrigCaloRatioHypo.h | 0
.../TrigL2HVJetHypo.h | 0
.../TrigL2HVJetHypoAllCuts.h | 0
.../TrigL2HVJetHypoTrk.h | 0
.../TrigLoFRemovalHypo.h | 0
.../TrigNewLoFHypo.h | 0
.../TrigLongLivedParticlesHypoConfig.py | 30 ++++++++---------
.../share/TriggerConfig_MuClusterHypo.py | 22 -------------
.../share/jobOfragment_MuonClusterHypo.py | 5 ---
.../src/MuonClusterHypo.cxx | 3 +-
.../src/MuonClusterIsolationHypo.cxx | 3 +-
.../src/TrigCaloRatioHypo.cxx | 10 +++---
.../src/TrigL2HVJetHypo.cxx | 6 ++--
.../src/TrigL2HVJetHypoAllCuts.cxx | 6 ++--
.../src/TrigL2HVJetHypoTrk.cxx | 3 +-
.../src/TrigLoFRemovalHypo.cxx | 3 +-
.../src/TrigNewLoFHypo.cxx | 3 +-
20 files changed, 33 insertions(+), 93 deletions(-)
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/MuonClusterHypo.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/MuonClusterIsolationHypo.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigCaloRatioHypo.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypo.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypoAllCuts.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypoTrk.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigLoFRemovalHypo.h
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigNewLoFHypo.h
delete mode 100755 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/TriggerConfig_MuClusterHypo.py
delete mode 100755 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/jobOfragment_MuonClusterHypo.py
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterHypo.cxx
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterIsolationHypo.cxx
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx
mode change 100755 => 100644 Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
index 19b891eaa29b..e01ebcd94dbf 100644
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/CMakeLists.txt
@@ -1,41 +1,17 @@
-################################################################################
-# Package: TrigLongLivedParticlesHypo
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigLongLivedParticlesHypo )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Trigger/TrigEvent/TrigCaloEvent
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigMuonEvent
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigSteer/TrigInterfaces
- Trigger/TrigTools/TrigTimeAlgs
- PRIVATE
- Calorimeter/CaloEvent
- Control/CxxUtils
- Event/xAOD/xAODJet
- Event/xAOD/xAODTracking
- Event/xAOD/xAODTrigger
- GaudiKernel
- Trigger/TrigEvent/TrigParticle )
-
# External dependencies:
-find_package( CLHEP )
find_package( tdaq-common COMPONENTS eformat )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint )
# Component(s) in the package:
atlas_add_component( TrigLongLivedParticlesHypo
src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${TDAQ-COMMON_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} ${TDAQ-COMMON_LIBRARIES} TrigCaloEvent TrigInDetEvent TrigMuonEvent TrigSteeringEvent TrigInterfacesLib TrigTimeAlgsLib CaloEvent CxxUtils xAODJet xAODTracking xAODTrigger GaudiKernel TrigParticle InDetIdentifier InDetPrepRawData IRegionSelector TrkSpacePoint xAODEventInfo)
+ INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
+ LINK_LIBRARIES ${COMMON_LIBRARIES-CaloEvent} CxxUtils GaudiKernel IRegionSelector InDetIdentifier InDetPrepRawData TDAQ TrigCaloEvent TrigInDetEvent TrigInterfacesLib TrigParticle TrigSteeringEvent TrigTimeAlgsLib TrkSpacePoint xAODEventInfo xAODJet xAODTracking xAODTrigger )
# Install files from the package:
-atlas_install_headers( TrigLongLivedParticlesHypo )
-atlas_install_python_modules( python/*.py )
-atlas_install_joboptions( share/*.py )
-
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/MuonClusterHypo.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/MuonClusterHypo.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/MuonClusterIsolationHypo.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/MuonClusterIsolationHypo.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigCaloRatioHypo.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigCaloRatioHypo.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypo.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypo.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypoAllCuts.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypoAllCuts.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypoTrk.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigL2HVJetHypoTrk.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigLoFRemovalHypo.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigLoFRemovalHypo.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigNewLoFHypo.h b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/TrigLongLivedParticlesHypo/TrigNewLoFHypo.h
old mode 100755
new mode 100644
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigLongLivedParticlesHypoConfig.py b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigLongLivedParticlesHypoConfig.py
index 6f45055af6db..5d338e939981 100755
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigLongLivedParticlesHypoConfig.py
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/python/TrigLongLivedParticlesHypoConfig.py
@@ -1,11 +1,7 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConf import *
-from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoMonitoring import *
-from AthenaCommon.SystemOfUnits import MeV, GeV
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.Logging import logging
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+import TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConf as Conf
+from AthenaCommon.SystemOfUnits import GeV
def getCaloRatioHypoInstance( instance, threshold, logratio, dotrackiso):
@@ -25,7 +21,7 @@ def getCaloRatioHypoInstance( instance, threshold, logratio, dotrackiso):
name=name )
-class MuonClusterHypoConfig (MuonClusterHypo):
+class MuonClusterHypoConfig (Conf.MuonClusterHypo):
__slots__ = []
def __init__(self, name, maxEta, midEta):
@@ -38,7 +34,7 @@ class MuonClusterHypoConfig (MuonClusterHypo):
self.maxEta = maxEta
self.midEta = midEta
-class MuonClusterIsolationHypoConfig (MuonClusterIsolationHypo):
+class MuonClusterIsolationHypoConfig (Conf.MuonClusterIsolationHypo):
__slots__ = []
def __init__(self, name, maxEta, midEta, numJet, numTrk, doIsolation):
super( MuonClusterIsolationHypoConfig, self ).__init__( name )
@@ -63,7 +59,7 @@ class MuonClusterIsolationHypoConfig (MuonClusterIsolationHypo):
self.nTrk = numTrk
self.doIsolation = doIsolation
-class L2HVJetHypoAllCutsBase (TrigL2HVJetHypoAllCuts):
+class L2HVJetHypoAllCutsBase (Conf.TrigL2HVJetHypoAllCuts):
__slots__ = []
def __init__(self, name):
super( L2HVJetHypoAllCutsBase, self ).__init__( name )
@@ -79,7 +75,7 @@ class L2HVJetHypoAllCutsBase (TrigL2HVJetHypoAllCuts):
self.AthenaMonTools = [ time, validation, online, cosmic ]
-class L2HVJetHypoAllCuts (L2HVJetHypoAllCutsBase):
+class L2HVJetHypoAllCuts (Conf.L2HVJetHypoAllCutsBase):
__slots__ = []
def __init__(self, name = "L2HVJetHypoAllCuts",l2_thr=35*GeV, l2_lrat=1.):
super( L2HVJetHypoAllCuts, self ).__init__( name )
@@ -93,7 +89,7 @@ class L2HVJetHypoAllCuts (L2HVJetHypoAllCutsBase):
self.doLowEMfCleaning = False
-class L2HVJetHypoAllCuts_doCleaning (L2HVJetHypoAllCuts):
+class L2HVJetHypoAllCuts_doCleaning (Conf.L2HVJetHypoAllCuts):
__slots__ = []
def __init__(self, name = "L2HVJetHypoAllCuts_doCleaning",l2_thr=35*GeV):
super( L2HVJetHypoAllCuts_doCleaning, self ).__init__( name )
@@ -114,7 +110,7 @@ class L2HVJetHypoAllCuts_doCleaning (L2HVJetHypoAllCuts):
self.jetTimeCellsThr = 25
-class L2HVJetHypoBase (TrigL2HVJetHypo):
+class L2HVJetHypoBase (Conf.TrigL2HVJetHypo):
__slots__ = []
def __init__(self, name):
super( L2HVJetHypoBase, self ).__init__( name )
@@ -165,7 +161,7 @@ class L2HVJetHypo_doCleaning (L2HVJetHypo):
self.jetTimeCellsThr = 25
-class L2HVJetHypoTrkBase (TrigL2HVJetHypoTrk):
+class L2HVJetHypoTrkBase (Conf.TrigL2HVJetHypoTrk):
__slots__ = []
def __init__(self, name):
super( L2HVJetHypoTrkBase, self ).__init__( name )
@@ -187,7 +183,7 @@ class L2HVJetHypoTrk (L2HVJetHypoTrkBase):
super( L2HVJetHypoTrk, self ).__init__( name )
-class TrigNewLoFHypoConfig (TrigNewLoFHypo):
+class TrigNewLoFHypoConfig (Conf.TrigNewLoFHypo):
__slots__ = []
def __init__(self, name = "TrigNewLoFHypoConfig"):
super( TrigNewLoFHypoConfig, self ).__init__( name )
@@ -197,7 +193,7 @@ class TrigNewLoFHypoConfig (TrigNewLoFHypo):
self.LoFCellContSize = 4
-class TrigLoFRemovalHypoConfig (TrigLoFRemovalHypo):
+class TrigLoFRemovalHypoConfig (Conf.TrigLoFRemovalHypo):
__slots__ = []
def __init__(self, name = "TrigLoFRemovalHypoConfig"):
super( TrigLoFRemovalHypoConfig, self ).__init__( name )
@@ -217,7 +213,7 @@ class TrigLoFRemovalHypoConfig (TrigLoFRemovalHypo):
self.LoFCellContSize = 4
-class CaloRatioHypo (TrigCaloRatioHypo):
+class CaloRatioHypo (Conf.TrigCaloRatioHypo):
__slots__ = []
def __init__(self, threshold, logratio, dotrackiso, name):
super( CaloRatioHypo, self ).__init__( name )
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/TriggerConfig_MuClusterHypo.py b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/TriggerConfig_MuClusterHypo.py
deleted file mode 100755
index 4330c5fe324d..000000000000
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/TriggerConfig_MuClusterHypo.py
+++ /dev/null
@@ -1,22 +0,0 @@
-include.block("TrigLongLivedParticlesHypo/TriggerConfig_MuClusterHypo.py")
-
-class TriggerConfig_MuClusterHypo:
-
- def __init__(self, level, type = None, threshold = None, isIsolated = None):
-
- if type == "muon":
- self.__instname__ = "muCluster_Muon_" + level
- self.__sequence__ = "MuClusterHypo/MuClusterHypo/Muon_"
- if type == "900GeV":
- self.__instname__ = "muCluster_900GeV_" + level
- self.__sequence__ = "MuClusterHypo/MuClusterHypo/900GeV_"
-
- #self.__sequence__ += threshold
-
- def instanceName(self):
- return self.__instname__
-
- def classAndInstanceName(self):
- return [ self.__sequence__ ]
-
-include ("TrigLongLivedParticlesHypo/jobOfragment_MuClusterHypo.py")
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/jobOfragment_MuonClusterHypo.py b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/jobOfragment_MuonClusterHypo.py
deleted file mode 100755
index 8045aa074b07..000000000000
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/share/jobOfragment_MuonClusterHypo.py
+++ /dev/null
@@ -1,5 +0,0 @@
-theApp.Dlls += [ "TrigLongLivedParticlesHypo" ]
-#
-# so far only one instance of the muon cluster hypothesis
-# algo is needed
-MuonClusterHypo = Algorithm( "MuonClusterHypo" )
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterHypo.cxx
old mode 100755
new mode 100644
index 99f147e320ff..5323c57ac4b5
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterHypo.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
*/
//
@@ -13,7 +13,6 @@
#include "xAODTrigger/TrigComposite.h"
#include "xAODTrigger/TrigCompositeContainer.h"
-#include "CLHEP/Units/SystemOfUnits.h"
class ISvcLocator;
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterIsolationHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterIsolationHypo.cxx
old mode 100755
new mode 100644
index cff42da580fd..297dbc65ee20
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterIsolationHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/MuonClusterIsolationHypo.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
*/
//
@@ -13,7 +13,6 @@
#include "xAODTrigger/TrigComposite.h"
#include "xAODTrigger/TrigCompositeContainer.h"
-#include "CLHEP/Units/SystemOfUnits.h"
class ISvcLocator;
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx
old mode 100755
new mode 100644
index 77d70149342f..0213c140b2d7
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigCaloRatioHypo.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
*/
// ************************************************************
@@ -23,7 +23,7 @@
#include "CxxUtils/fpcompare.h"
-#include "CLHEP/Units/SystemOfUnits.h"
+#include "GaudiKernel/SystemOfUnits.h"
//** ----------------------------------------------------------------------------------------------------------------- **//
@@ -31,7 +31,7 @@
TrigCaloRatioHypo::TrigCaloRatioHypo(const std::string& name, ISvcLocator* pSvcLocator):
HLT::HypoAlgo(name, pSvcLocator) {
- declareProperty("EtCut", m_etCut = 30*CLHEP::GeV, "cut value forthe jet et");
+ declareProperty("EtCut", m_etCut = 30*Gaudi::Units::GeV, "cut value forthe jet et");
declareProperty("LogRatioCut", m_logRatioCut = 1.2, "cut value for the jet energy ratio");
declareProperty("PtMinID", m_ptCut = 2000.0, "minimum track Pt in MeV for the isolation requirement");
declareProperty("TrackCut", m_trackCut = 0, "minimum number of tracks for the isolation requirement");
@@ -165,7 +165,7 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE
if (jetEt > m_etCut && std::fabs(jetEta) <= m_etaCut) {
- m_jetEt.push_back(jetEt/CLHEP::GeV);
+ m_jetEt.push_back(jetEt/Gaudi::Units::GeV);
m_jetEta.push_back(jetEta);
m_jetPhi.push_back(jetPhi);
m_logRatio = jetRatio;
@@ -177,7 +177,7 @@ HLT::ErrorCode TrigCaloRatioHypo::hltExecute(const HLT::TriggerElement* outputTE
if (jetEt > m_etCut && std::fabs(jetEta) <= m_etaCut && jetRatio <= m_logRatioCut) {
- m_jetEt.push_back(jetEt/CLHEP::GeV);
+ m_jetEt.push_back(jetEt/Gaudi::Units::GeV);
m_jetEta.push_back(jetEta);
m_jetPhi.push_back(jetPhi);
m_logRatio = jetRatio;
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx
old mode 100755
new mode 100644
index f8459986f730..9847c7505e15
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypo.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
*/
// ********************************************************************
@@ -16,6 +16,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/StatusCode.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
@@ -28,7 +29,6 @@
#include "CxxUtils/fpcompare.h"
-#include "CLHEP/Units/SystemOfUnits.h"
class ISvcLocator;
@@ -40,7 +40,7 @@ class ISvcLocator;
TrigL2HVJetHypo::TrigL2HVJetHypo(const std::string& name, ISvcLocator* pSvcLocator):
HLT::HypoAlgo(name, pSvcLocator) {
- declareProperty("Etcut_L2", m_EtCut_L2 = 35*CLHEP::GeV, "cut value for L2 jet et");
+ declareProperty("Etcut_L2", m_EtCut_L2 = 35*Gaudi::Units::GeV, "cut value for L2 jet et");
declareProperty("LRaticout_L2", m_LRatioCut_L2 = 1., "cut value for L2 jet log10 of had over em energy ratio");
declareProperty("doMonitoring_L2", m_doMonitoring = true, "switch on/off monitoring" );
declareProperty("AcceptAll", m_acceptAll=false);
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx
old mode 100755
new mode 100644
index 024b2e25107e..5ca6ec829732
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoAllCuts.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
*/
// ********************************************************************
@@ -16,6 +16,7 @@
#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/IToolSvc.h"
#include "GaudiKernel/StatusCode.h"
+#include "GaudiKernel/SystemOfUnits.h"
#include "TrigSteeringEvent/TrigRoiDescriptor.h"
@@ -29,7 +30,6 @@
#include "CxxUtils/fpcompare.h"
#include "CxxUtils/phihelper.h"
-#include "CLHEP/Units/SystemOfUnits.h"
class ISvcLocator;
@@ -41,7 +41,7 @@ class ISvcLocator;
TrigL2HVJetHypoAllCuts::TrigL2HVJetHypoAllCuts(const std::string& name, ISvcLocator* pSvcLocator):
HLT::HypoAlgo(name, pSvcLocator) {
- declareProperty("Etcut_L2", m_EtCut_L2 = 35*CLHEP::GeV, "cut value for L2 jet et");
+ declareProperty("Etcut_L2", m_EtCut_L2 = 35*Gaudi::Units::GeV, "cut value for L2 jet et");
declareProperty("LRaticout_L2", m_LRatioCut_L2 = 1., "cut value for L2 jet log10 of had over em energy ratio");
declareProperty("doMonitoring_L2", m_doMonitoring = true, "switch on/off monitoring" );
declareProperty("AcceptAll", m_acceptAll=false);
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx
old mode 100755
new mode 100644
index e95162aac408..845de575dc8d
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigL2HVJetHypoTrk.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
*/
// ********************************************************************
@@ -27,7 +27,6 @@
#include "TrigInDetEvent/TrigInDetTrackHelper.h"
#include "CxxUtils/phihelper.h"
-#include "CLHEP/Units/SystemOfUnits.h"
class ISvcLocator;
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx
old mode 100755
new mode 100644
index b94870f887c5..59f602bd74eb
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigLoFRemovalHypo.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
*/
// ********************************************************************
@@ -28,7 +28,6 @@
#include "CaloEvent/CaloCellContainer.h"
#include "CaloEvent/CaloCell.h"
-#include "CLHEP/Units/SystemOfUnits.h"
diff --git a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx
old mode 100755
new mode 100644
index c21f825216da..0c0dd63143ba
--- a/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.cxx
+++ b/Trigger/TrigHypothesis/TrigLongLivedParticlesHypo/src/TrigNewLoFHypo.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
*/
#include <algorithm>
@@ -19,7 +19,6 @@
#include "CaloEvent/CaloCellContainer.h"
#include "CaloEvent/CaloCell.h"
-#include "CLHEP/Units/SystemOfUnits.h"
class ISvcLocator;
--
GitLab