diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..472a2a0d7ae6b87e644cadd04c4f8b97d7882bcf
--- /dev/null
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/CMakeLists.txt
@@ -0,0 +1,22 @@
+################################################################################
+# Package: TrigEgammaMonitoring
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrigEgammaMonitoring )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Trigger/TrigEvent/TrigCaloEvent
+ Trigger/TrigEvent/TrigInDetEvent
+ Trigger/TrigEvent/TrigParticle
+ Trigger/TrigEvent/TrigSteeringEvent )
+
+# External dependencies:
+find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread MathMore Minuit Minuit2 Matrix Physics HistPainter Rint Graf Graf3d Gpad Html Postscript Gui GX11TTF GX11 )
+
+# Install files from the package:
+atlas_install_headers( TrigEgammaMonitoring )
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py )
+
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py
index 8be39f96776f34942cfa67703c4bc0d6f86bd03f..86b0a7b3ded9a0c415e13b389a0e2ab572d10ab9 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategory.py
@@ -25,12 +25,11 @@ monitoring_egamma = primary_single_ele + primary_double_ele + monitoring_ele_idp
# L1 trigger items to monitor from inclusive offline electrons
monitoring_L1Calo = ['L1_EM20VH','L1_EM20VHI','L1_EM22VHI']
# Startup and high-pt electrons to monitor from inclusive electrons
-monitoring_electron = ['HLT_e60_lhmedium_nod0','HLT_e140_lhloose_nod0',
- 'HLT_e24_lhmedium_L1EM20VH','HLT_e24_lhmedium_L1EM20VHI','HLT_e24_lhmedium_iloose',
- 'HLT_e24_lhmedium_ivarloose','HLT_e24_lhmedium_nod0_ivarloose',
- 'HLT_e24_lhtight_nod0_ivarloose']
+monitoring_electron = ['HLT_e60_lhmedium_nod0','HLT_e140_lhloose_nod0']
# 2016 single electrons triggers to monitor from Zee TP, includes rerun
monitoringTP_electron = ['HLT_e17_lhvloose_nod0','HLT_e26_lhtight_nod0','HLT_e26_lhtight_nod0_ivarloose',
+ 'HLT_e24_lhmedium_L1EM20VH','HLT_e24_lhmedium_L1EM20VHI','HLT_e24_lhmedium_iloose',
+ 'HLT_e24_lhmedium_ivarloose','HLT_e24_lhmedium_nod0_ivarloose','HLT_e24_lhtight_nod0_ivarloose',
'HLT_e26_lhtight_cutd0detadphi_ivarloose']
monitoringTP_Jpsiee = ["HLT_e5_lhtight_nod0"]
monitoring_photon = ['HLT_g25_medium','HLT_g140_loose']
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
index 415f082aeaa439af32be8be479b362f2f23a9399..6c441d490e190ef5e0b6f12f8982a63d96c8219a 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
@@ -28,7 +28,7 @@ def TrigEgammaMonitoringTool():
MaM=monitoring_mam,
Efficiency=["eff_et","eff_eta","eff_mu"],
Distribution=["et","eta","Reta","Rphi","Rhad","f1","f3","eratio","deta2","eprobHT","npixhits","nscthits","ptvarcone20"],
- Resolution=["res_et","res_Rhad","res_ptvarcone20","res_deta2"],
+ Resolution=["res_et","res_Rphi","res_Reta","res_Rhad","res_ptvarcone20","res_deta2"],
OutputLevel=debugLevel)
HLTEgammaEffTool = EfficiencyTool(name="HLTEgammaEffTool",PlotTool=HLTEgammaPlotTool,OutputLevel=debugLevel)
@@ -58,7 +58,9 @@ def TrigEgammaMonitoringTool():
Analysis='Electrons',
PlotTool=HLTEgammaPlotTool,
Tools=[HLTEgammaEffTool,HLTEgammaResTool,HLTEgammaDistTool],
- TriggerList=monitoring_L1Calo+monitoring_electron,
+ TriggerList=monitoring_electron,
+ ForceProbeIsolation=True,
+ DefaultProbePid="LHMedium",
File="",
OutputLevel=debugLevel,DetailedHistograms=False)
PhotonAnalysis = TrigEgammaNavAnalysisTool(name='HLTEgammaPhotonAnalysis',
@@ -72,7 +74,8 @@ def TrigEgammaMonitoringTool():
Analysis='Zee',
PlotTool=HLTEgammaPlotTool,
Tools=[HLTEgammaEffTool,HLTEgammaResTool,HLTEgammaDistTool],
- TriggerList=monitoringTP_electron+monitoring_ele_idperf,
+ TriggerList=monitoringTP_electron+monitoring_ele_idperf+monitoring_L1Calo,
+ DefaultProbePid="LHMedium",
File="",
TagTriggerList=tagItems,
RemoveCrack=False,
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py
index 8c01c4138641c6817ee58ed85ad2fd0885922af1..72a18327774fa4130c68341c7679056c5aae8e06 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/share/testAthenaTrigAOD_TrigEgammaMonitoring.py
@@ -1,20 +1,18 @@
from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
from glob import glob
-if not ('inputDir' in dir()):
- inputDir='/tmp/avishek/'
-
if ('FILE' in dir()):
acf.FilesInput=[FILE]
-else:
+if ('inputDir' in dir()):
inputFiles = glob(inputDir+'*')
acf.FilesInput=inputFiles
+if not acf.EvtMax.is_locked():
+ acf.EvtMax=-1
+if ('NOV' in dir()):
+ acf.EvtMax=NOV
from RecExConfig.RecFlags import rec
-if not 'RootNtupleOutput' in dir():
- rec.RootNtupleOutput="ntuple_fromAOD.root"
-
rec.doCBNT=False
rec.readESD=False
rec.doWriteESD=False
@@ -23,15 +21,6 @@ rec.doAOD=False
rec.doDPD=False
rec.doWriteTAG=False
-#doTrigger=True
-#SkipEvents=840
-
-if not acf.EvtMax.is_locked():
- acf.EvtMax=-1
-if not ('OutputLevel' in dir()):
- #OutputLevel=DEBUG
- rec.OutputLevel=INFO
-
#-----------------------------------------------------------
include("RecExCond/RecExCommon_flags.py")
#-----------------------------------------------------------
@@ -41,7 +30,6 @@ TriggerFlags.configurationSourceList.set_Value_and_Lock( [ "ds" ] )
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
TriggerConfigGetter()
-
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
@@ -49,22 +37,6 @@ from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
topSequence += AthenaMonManager( "HLTMonManager")
HLTMonManager = topSequence.HLTMonManager
-################ Mon Tools #################
-
-#Global HLTMonTool
-
-from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
-HLTMon = HLTMonTool(name = 'HLTMon',
- histoPathBase = "/Trigger/HLT");
-
-#HLTMon.TrigDecisionTool = monTrigDecTool
-
-ToolSvc += HLTMon;
-
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
-
-
-
from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import TrigEgammaMonitoringTool
HLTMonManager.AthenaMonTools += TrigEgammaMonitoringTool()