From a7c82465df65d7d442cf914146774bced0a908e6 Mon Sep 17 00:00:00 2001
From: Ryan Mackenzie White <ryan.white@cern.ch>
Date: Thu, 16 Feb 2017 21:18:16 +0100
Subject: [PATCH] lumitool (TrigEgammaRec-02-00-81)
* Add LumiTool to PidBuilder
* TrigEgammaRec-02-00-81
Former-commit-id: fc65781c3b20cb6ae6dc93e48ea27113408ede67
---
.../TrigEgammaRec/doc/mainpage.h | 18 ------------------
.../python/TrigEgammaToolFactories.py | 7 +++++++
2 files changed, 7 insertions(+), 18 deletions(-)
delete mode 100755 Trigger/TrigAlgorithms/TrigEgammaRec/doc/mainpage.h
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/doc/mainpage.h b/Trigger/TrigAlgorithms/TrigEgammaRec/doc/mainpage.h
deleted file mode 100755
index 9499bb5f740..00000000000
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/doc/mainpage.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-
-/**
-
-@mainpage
-@author P. Urquijo
-
-@section MyPackageOverview Overview
-This package contains the Event Filter reconstruction trigger algorithms for the Electron and Photon slices. Algorithms are adaptations of the offline/Reconstruction/egammaRec/egammaBuilder.cxx
-
-@htmlinclude used_packages.html
-
-
-*/
-
diff --git a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
index ebf7938bde3..918db58fdf8 100644
--- a/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
+++ b/Trigger/TrigAlgorithms/TrigEgammaRec/python/TrigEgammaToolFactories.py
@@ -33,6 +33,9 @@ from TrigEgammaHypo.TrigEgammaPidTools import ElectronPidTools
from TrigEgammaHypo.TrigEgammaPidTools import PhotonPidTools
ElectronPidTools()
PhotonPidTools()
+from LumiBlockComps.LuminosityToolDefault import LuminosityToolOnline
+lumiTool = LuminosityToolOnline()
+
# Following tools have TrigEgamma factories
from egammaTools.egammaToolsFactories import EMTrackMatchBuilder, EMFourMomBuilder, EMShowerBuilder
from egammaTrackTools.egammaTrackToolsFactories import EMExtrapolationTools
@@ -93,6 +96,8 @@ TrigElectronPIDBuilder = ToolFactory( EMPIDBuilder, name = "TrigElectronPIDBuild
ToolSvc.AsgElectronLHMediumSelector,
ToolSvc.AsgElectronLHTightSelector],
electronLHselectorResultNames= ["LHVLoose","LHLoose","LHMedium","LHTight"],
+ UseLuminosityTool = True,
+ LuminosityTool = lumiTool
)
TrigElectronCaloPIDBuilder = ToolFactory( EMPIDBuilder, name = "TrigElectronCaloPIDBuilder",
@@ -102,6 +107,8 @@ TrigElectronCaloPIDBuilder = ToolFactory( EMPIDBuilder, name = "TrigElectronCalo
ToolSvc.AsgElectronLHTightCaloSelector],
electronLHselectorResultNames= ["LHCaloVLoose","LHCaloLoose","LHCaloMedium","LHCaloTight"],
LHValueName = "LHCaloValue",
+ UseLuminosityTool = True,
+ LuminosityTool = lumiTool
)
TrigPhotonPIDBuilder = ToolFactory( EMPIDBuilder, name = "TrigPhotonPIDBuilder",
--
GitLab