diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
index a0bcc2ad47607ed47dc789051d7689a37e94a5b0..e1a73b62b6721839382b2ab7332e1db3dd0bb8d4 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/CMakeLists.txt
@@ -22,8 +22,7 @@ atlas_add_component( TrigEgammaAnalysisTools
    LINK_LIBRARIES AsgTools AthenaBaseComps AthenaMonitoringLib TrigEgammaAnalysisToolsLib xAODEgamma )
 
 # Install files from the package:
-atlas_install_python_modules( python/TrigEgamma*.py )
-atlas_install_joboptions( share/test*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_generic( share/trigEgammaDQ.py share/get_trigEgammaDQ.sh 
    DESTINATION share
    EXECUTABLE )
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py
index e9cba421f6d3d988f0a9ed2a5eb768d41b0f74de..c914e5a011650905431fa3b3ff144a062b32fc96 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaAnalysisToolsConfig.py
@@ -8,25 +8,19 @@ from TrigEgammaAnalysisTools import TrigEgammaAnalysisToolsConf
 from AthenaCommon import CfgMgr
 from AthenaCommon.AppMgr import ToolSvc
 
-from egammaRec.Factories import PublicToolFactory,FcnWrapper,AlgFactory, getPropertyValue 
+from egammaRec.Factories import PublicToolFactory
 
 import PyUtils.RootUtils as ru
 ROOT = ru.import_root()
 import cppyy
 cppyy.load_library('libElectronPhotonSelectorToolsDict')
-from ROOT import LikeEnum
-from ROOT import egammaPID
 
 # Following loads the online selectors
 from TrigEgammaHypo.TrigEgammaPidTools import ElectronPidTools
 from TrigEgammaHypo.TrigEgammaPidTools import PhotonPidTools
-from TrigEgammaHypo.TrigEgammaPidTools import ElectronToolName
 ElectronPidTools()
 PhotonPidTools()
 
-from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronIsEMSelector, AsgElectronLikelihoodTool
-from ElectronPhotonSelectorTools.ElectronIsEMSelectorMapping import ElectronIsEMMap,electronPIDmenu
-
 # Offline selectors -- taken from latest conf
 LooseElectronSelector             = CfgMgr.AsgElectronIsEMSelector("T0HLTLooseElectronSelector")
 MediumElectronSelector            = CfgMgr.AsgElectronIsEMSelector("T0HLTMediumElectronSelector")
@@ -67,7 +61,7 @@ LuminosityCondAlgOnlineDefault (suffix = 'Online')
 IneffLabels=["ClusterEtaRange","ConversionMatch","ClusterHadronicLeakage","ClusterMiddleEnergy","ClusterMiddleEratio37","ClusterMiddleEratio33","ClusterMiddleWidth","f3","ClusterStripsEratio","ClusterStripsDeltaEmax2","ClusterStripsDeltaE","ClusterStripsWtot","ClusterStripsFracm","ClusterStripsWeta1c","empty14","ClusterStripsDEmaxs1","TrackBlayer","TrackPixel","TrackSi","TrackA0","TrackMatchEta","TrackMatchPhi","TrackMatchEoverP","TrackTRTeProbabilityHT_Electron","TrackTRThits","TrackTRTratio","TrackTRTratio90","TrackA0Tight","TrackMatchEtaTight","Isolation","ClusterIsolation","TrackIsolation","No Track","No Cluster","No Object"]
 
 from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoring_mam, monitoring_electron, monitoring_photon 
-from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoringTP_electron, monitoringTP_electronZee, monitoringTP_electronJpsiee 
+from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoringTP_electron,  monitoringTP_electronJpsiee 
 
 from TrigEgammaMatchingTool.TrigEgammaMatchingToolConf import Trig__TrigEgammaMatchingTool
 
@@ -197,9 +191,6 @@ TrigEgammaNavAnalysisTool = PublicToolFactory(TrigEgammaAnalysisToolsConf.TrigEg
 #############################################################################################
 # Functions
 
-# Function to return triggerlist tools
-def getAllTools():
-    return [TrigEgammaNavZeeTPCounts(),TrigEgammaNavZeeTPEff(),TrigEgammaNavZeeTPIneff(),TrigEgammaNavZeeTPRes(),]
 
 
 def setRunFlag( runFlag ):
@@ -230,12 +221,6 @@ def setRunFlag( runFlag ):
 
 
 
-# The main algorithm
-# Add triggerlist tools to ToolHandleArray 
-TrigEgammaAnalysisAlg = AlgFactory(TrigEgammaAnalysisToolsConf.TrigEgammaAnalysisAlg, 
-        name='TrigEgammaAnalysisAlg',
-        Tools = FcnWrapper(getAllTools),
-        )
 
 
 
@@ -246,10 +231,7 @@ def getEventSelectionTool(runFlag):
   from TrigEgammaEmulationTool.TrigEgammaEmulationPidToolsConfig import getEgammaIsEMSelectorCaloOnly, \
                                                                         getElectronIsEMSelector,\
                                                                         getEgammaLikelihoodSelectorCaloOnly, \
-                                                                        getElectronLikelihoodSelector2015,\
                                                                         getElectronLikelihoodSelectorNoD0
-  from AthenaCommon import CfgMgr
-  from AthenaCommon.AppMgr import ToolSvc
   # create all selector list. Here, the order is matter. Please check the 
   
   setRunFlag(runFlag)
@@ -277,7 +259,7 @@ def getEventSelectionTool(runFlag):
           ElectronKey = 'Electrons',
           MatchTool = EgammaMatchTool,
           PlotTool=TrigEgammaPlotTool,
-          EmulationTool=EmulationTool, # The emulation must be on in this tool.
+          #EmulationTool=EmulationTool, # The emulation must be on in this tool.
           doEmulation=True,
           Tools=[],
           isEMResultNames=["Tight","Medium","Loose"],
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py
deleted file mode 100644
index 96f9961fb6f56b6b84ac8bcfbd7c4374e8223c38..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def TrigEgammaMonTool():
-    #from AthenaCommon.AppMgr import ToolSvc
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool,TrigEgammaNavTPJpsieeAnalysisTool
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaPlotTool
-    from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoring_mam, monitoring_electron, monitoring_photon 
-    from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoringTP_electron, monitoringTP_electronZee, monitoringTP_electronJpsiee 
-
-
-    #Define the base path for all histograms
-    basePath = '/HLT/Egamma'
-    
-    tagItems     = ['HLT_e24_lhmedium_iloose_L1EM18VH',
-                    'HLT_e24_lhmedium_iloose_L1EM20VH',
-                    'HLT_e24_lhtight_iloose',
-                    'HLT_e26_lhtight_iloose',
-                    # Primary cut-based electron triggers
-                    'HLT_e24_medium_iloose_L1EM18VH',
-                    'HLT_e24_medium_iloose_L1EM20VH',
-                    'HLT_e24_tight_iloose',
-                    'HLT_e26_tight_iloose']
-
-    JpsitagItems = ['HLT_e5_tight_e4_etcut',
-                    'HLT_e9_tight_e4_etcut',
-                    'HLT_e14_tight_e4_etcut',
-                    'HLT_e9_etcut_e5_tight',
-                    'HLT_e14_etcut_e5_tight',
-                    # Primary cut-based electron triggers
-                    'HLT_e5_tight_e4_etcut_Jpsiee',
-                    'HLT_e9_tight_e4_etcut_Jpsiee',
-                    'HLT_e14_tight_e4_etcut_Jpsiee',
-                    'HLT_e9_etcut_e5_tight_Jpsiee',
-                    'HLT_e14_etcut_e5_tight_Jpsiee']
-
-    #Configure the TrigEgammaPlotTool
-    PlotTool = TrigEgammaPlotTool.copy(name="TrigEgammaPlotTool",
-            DirectoryPath=basePath,
-            MaM=monitoring_mam,
-            Efficiency=["eff_et","eff_eta","eff_mu"],
-            Distribution=["et","eta","d0","d0sig"],
-            Resolution=["res_et","res_eta","res_Rhad","res_Rphi","res_Reta"])
-
-    #Configure emulation tools
-    #from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationTool
-    #EmulationPhotonTool     = TrigEgammaEmulationTool.copy( TriggerList = monitoring_photon          , name = "EmulationPhotonTool"     )
-    #EmulationElectronTool   = TrigEgammaEmulationTool.copy( TriggerList = monitoring_electron        , name = "EmulationElectronTool"   )
-    #EmulationTPElectronTool = TrigEgammaEmulationTool.copy( TriggerList = monitoringTP_electron      , name = "EmulationTPElectronTool" )
-    #EmulationJpsieeTool     = TrigEgammaEmulationTool.copy( TriggerList = monitoringTP_electronJpsiee, name = "EmulationJpsieeTool"     )
-
-
-    ElectronAnalysis = TrigEgammaNavAnalysisTool(name='NavElectronAnalysis',
-            Analysis='Electrons',
-            PlotTool=PlotTool,
-            TriggerList=monitoring_electron,
-            File="",
-            #doEmulation=True,
-            #EmulationTool=EmulationElectronTool,
-            OutputLevel=0,DetailedHistograms=False)
-    PhotonAnalysis = TrigEgammaNavAnalysisTool(name='NavPhotonAnalysis',
-            Analysis='Photons',
-            PlotTool=PlotTool,
-            TriggerList=monitoring_photon,
-            File="",
-            #doEmulation=True,
-            #EmulationTool=EmulationPhotonTool,
-            OutputLevel=0,DetailedHistograms=False)
-    TPAnalysis = TrigEgammaNavTPAnalysisTool(name='NavTPAnalysis',
-            Analysis='Zee',
-            PlotTool=PlotTool,
-            TriggerList=monitoringTP_electron,
-            File="",
-            TagTriggerList=tagItems,
-            #doEmulation=True,
-            #EmulationTool=EmulationTPElectronTool,
-            RemoveCrack=False,
-            OutputLevel=0,DetailedHistograms=False)
-    JpsiTPAnalysis = TrigEgammaNavTPJpsieeAnalysisTool(name='NavTPJpsieeAnalysis',
-                                                        Analysis='Jpsiee',
-                                                        PlotTool=PlotTool,
-                                                        TriggerList=monitoringTP_electronJpsiee,
-                                                        File="",
-                                                        #doEmulation=True,
-                                                        #EmulationTool=EmulationJpsieeTool,
-                                                        TagTriggerList= JpsitagItems)
-
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
-    TrigEgammaMonTool = TrigEgammaMonTool( name = "HLTEgammaMon", 
-            histoPathBase=basePath,
-            Tools=[
-                "TrigEgammaNavAnalysisTool/NavPhotonAnalysis",
-                "TrigEgammaNavAnalysisTool/NavElectronAnalysis",
-                "TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
-                "TrigEgammaNavTPAnalysisTool/NavTPJpsieeAnalysis"])
-    #ToolSvc += TrigEgammaMonTool
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py
deleted file mode 100644
index 7af1f7b52df49d14e7f0dfbf8a7e3b67b9ed0e47..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def TrigEgammaMonTool():
-    #from AthenaCommon.AppMgr import ToolSvc
-    from AthenaCommon import CfgMgr
-    from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronIsEMSelector
-    from ElectronPhotonSelectorTools.ElectronIsEMSelectorMapping import ElectronIsEMMap,electronPIDmenu
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool,TrigEgammaNavTPJpsieeAnalysisTool
-    from TrigEgammaAnalysisTools.TrigEgammaProbelist import default,defaultJpsi # to import probelist
-    #from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # import MaM trigger list, not available!!!!
-   
-    # Import full trigger menu, requires setup of both MC and Physics
-    # Makes available all possible triggers which can be in any dataset
-    # Set final list from triggers available in data
-    import TriggerMenu.menu.Physics_pp_v5 as physics_menu
-    from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-    # Offline selectors -- taken from latest conf
-    # Offline tunes for 50 ns
-    LooseElectronSelector=CfgMgr.AsgElectronIsEMSelector("LooseElectron50nsSelector")
-    LooseElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronIsEMLooseSelectorCutDefs.conf"
-    ToolSvc+=LooseElectronSelector
-    MediumElectronSelector=CfgMgr.AsgElectronIsEMSelector("MediumElectron50nsSelector")
-    MediumElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronIsEMMediumSelectorCutDefs.conf"
-    ToolSvc+=MediumElectronSelector
-    TightElectronSelector=CfgMgr.AsgElectronIsEMSelector("TightElectron50nsSelector")
-    TightElectronSelector.ConfigFile = "ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronIsEMTightSelectorCutDefs.conf"
-    ToolSvc+=TightElectronSelector
-
-    LooseLHSelector=CfgMgr.AsgElectronLikelihoodTool("LooseLH50nsSelector")
-    LooseLHSelector.ConfigFile="ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronLikelihoodLooseOfflineConfig2015.conf"
-    ToolSvc+=LooseLHSelector
-    MediumLHSelector=CfgMgr.AsgElectronLikelihoodTool("MediumLH50nsSelector")
-    MediumLHSelector.ConfigFile="ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronLikelihoodMediumOfflineConfig2015.conf"
-    ToolSvc+=MediumLHSelector
-    TightLHSelector=CfgMgr.AsgElectronLikelihoodTool("TightLH50nsSelector")
-    TightLHSelector.ConfigFile="ElectronPhotonSelectorTools/offline/mc15_20150429/ElectronLikelihoodTightOfflineConfig2015.conf"
-    ToolSvc+=TightLHSelector
-
-    physics_menu.setupMenu()
-    egammaMenu = TriggerFlags.EgammaSlice.signatures()
-    egammaChains = []
-    l1Items = []
-    addItems = []
-    for egchain in egammaMenu:
-        egammaChains.append(egchain[0])
-        l1Items.append(egchain[1])
-        addItems.append(egchain[3])
-    # Set list to full menu
-    #probelist = egammaChains
-    probelist = default
-    Jpsiprobelist = defaultJpsi
-    #probelist=['e5_loose_idperf','e5_lhloose_idperf','e0_perf_L1EM15','g0_perf_L1EM15']
-
-    basePath = '/HLT/Egamma/'
-    tagItems = ['e24_lhmedium_iloose_L1EM18VH',
-        'e24_lhmedium_iloose_L1EM20VH',
-        'e24_lhtight_iloose',
-        'e26_lhtight_iloose',
-        # Primary cut-based electron triggers
-        'e24_medium_iloose_L1EM18VH',
-        'e24_medium_iloose_L1EM20VH',
-        'e24_tight_iloose',
-        'e26_tight_iloose']
-
-    JpsitagItems = ['e5_tight_e4_etcut',
-                    'e9_tight_e4_etcut',
-                    'e14_tight_e4_etcut',
-                    'e9_etcut_e5_tight',
-                    'e14_etcut_e5_tight',
-                    # Primary cut-based electron triggers
-                    'e5_tight_e4_etcut_Jpsiee',
-                    'e9_tight_e4_etcut_Jpsiee',
-                    'e14_tight_e4_etcut_Jpsiee',
-                    'e9_etcut_e5_tight_Jpsiee',
-                    'e14_etcut_e5_tight_Jpsiee']
-    Analysis = TrigEgammaNavAnalysisTool(name='NavAnalysis',
-            DirectoryPath=basePath+'Analysis',
-            TriggerList=probelist, 
-            ElectronIsEMSelector =[TightElectronSelector,MediumElectronSelector,LooseElectronSelector],
-            ElectronLikelihoodTool =[TightLHSelector,MediumLHSelector,LooseLHSelector], 
-            File="",
-            OutputLevel=0,DetailedHistograms=False)
-    TPAnalysis = TrigEgammaNavTPAnalysisTool(name='NavTPAnalysis',
-            DirectoryPath=basePath+'TPAnalysis',
-            TriggerList=probelist, 
-            ElectronIsEMSelector =[TightElectronSelector,MediumElectronSelector,LooseElectronSelector],
-            ElectronLikelihoodTool =[TightLHSelector,MediumLHSelector,LooseLHSelector], 
-            File="",
-            TagTriggerList=tagItems,
-            RemoveCrack=False,
-            OutputLevel=0,DetailedHistograms=True)
-    JpsiTPAnalysis = TrigEgammaNavTPJpsieeAnalysisTool(name='NavTPJpsieeAnalysis',
-                                                        DirectoryPath=basePath+'TPJpsieeAnalysis',
-                                                        TriggerList=Jpsiprobelist,
-                                                        File="",
-                                                        TagTriggerList= JpsitagItems,
-                                                        RemoveCrack=True,
-                                                        ZeeLowerMass=2,
-                                                        ZeeUpperMass=5,
-                                                        OfflineTagMinEt=5,
-                                                        OfflineProbeMinEt=5,
-                                                        OutputLevel=0,
-                                                        DetailedHistograms=False,
-                                                        doJpsiee=True)
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
-    TrigEgammaMonTool = TrigEgammaMonTool( name = "TrigEgammaMonTool", 
-            histoPathBase=basePath,
-            Tools=["TrigEgammaNavAnalysisTool/NavAnalysis",
-                "TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
-                "TrigEgammaNavTPAnalysisTool/NavTPJpsieeAnalysis"])
-    #ToolSvc += TrigEgammaMonTool
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py
deleted file mode 100644
index 9ef1c9d4453136a3f8f9b270a1e4232cdd119011..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-def TrigEgammaPhysValMonTool():
-    #from AthenaCommon.AppMgr import ToolSvc
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaEmulationTool
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool, TrigEgammaNavNtuple, TrigEgammaNavTPNtuple
-    from TrigEgammaAnalysisTools.TrigEgammaProbelist import default, probeListLowMidPtPhysicsTriggers # to import probelist
-    
-    #from TrigHLTMonitoring.HLTMonTriggerList import hltmonList # import MaM trigger list not available!!!!
-    import TriggerMenu.menu.Physics_pp_v5 as physics_menu
-    import TriggerMenu.menu.MC_pp_v5 as mc_menu
-    from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-   
-    physics_menu.setupMenu()
-    mc_menu.setupMenu()
-    egammaMenu = TriggerFlags.EgammaSlice.signatures()
-    egammaChains = []
-    l1Items = []
-    addItems = []
-    for egchain in egammaMenu:
-        egammaChains.append(egchain[0])
-        l1Items.append(egchain[1])
-        addItems.append(egchain[3])
-    # Set list to full menu
-    #probelist = egammaChains
-    probelist = default
-    #probelist = list(set(default+probeListLowMidPtPhysicsTriggers))
-    
-
-    basePath = 'Trigger/HLT/Egamma/'
-    tagItems = [
-        'e24_lhmedium_iloose_L1EM18VH',
-        'e24_lhmedium_iloose_L1EM20VH',
-        'e24_lhtight_iloose'
-        'e26_lhtight_iloose',
-        #Primary cut-based electron triggers
-        'e24_medium_iloose_L1EM18VH',
-        'e24_medium_iloose_L1EM20VH',
-        'e24_tight_iloose',
-        'e26_tight_iloose'
-        ]
-    Analysis = TrigEgammaNavAnalysisTool(name='NavAnalysis',
-            DirectoryPath=basePath+'Analysis',
-            TriggerList=probelist, 
-            File="PhysVal")
-    
-    TPAnalysis = TrigEgammaNavTPAnalysisTool(name='NavTPAnalysis',
-            DirectoryPath=basePath+'TPAnalysis',
-            TriggerList=probelist, 
-            File="PhysVal",
-            TagTriggerList=tagItems,
-            OutputLevel=0)
- 
-    Emulation = TrigEgammaEmulationTool("Emulation",TriggerList=probelist)
- 
-
-    Ntuple    = TrigEgammaNavNtuple(name="NavNtuple",
-            DirectoryPath=basePath+'Ntuple',
-            TriggerList=probelist,
-            DoOfflineDump=False,
-            ForcePidSelection=True,
-            ForceProbeIsolation=False,
-            ForceEtThreshold=True,
-            RemoveCrack=True,
-            #ForceFilterSelection=False,
-            #ElectronFilterType="Tight",
-            File="PhysVal",
-            OutputLevel=0)
-
-   
-    TPNtuple  = TrigEgammaNavTPNtuple(name="NavTPNtuple",
-            DirectoryPath=basePath+'TPNtuple',
-            TriggerList=probelist,
-            File="PhysVal",
-            TagTriggerList=tagItems,
-            OutputLevel=0)
-
-
-    from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaPhysValMonTool
-    TrigEgammaPhysValMonTool = TrigEgammaPhysValMonTool( name = "TrigEgammaPhysValMonTool", 
-            histoPathBase=basePath,
-            Tools=[
-                "TrigEgammaNavAnalysisTool/NavAnalysis",
-                "TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
-                "TrigEgammaEmulationTool/Emulation",
-                "TrigEgammaNavNtuple/NavNtuple",
-                "TrigEgammaNavTPNtuple/NavTPNtuple"
-                ])
-
-    #ToolSvc += TrigEgammaPhysValMonTool
-
-
-
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py
index be86a3aa05aee9ad112d55350dde2e3caac6bb9c..ed20ee82f66c29ccb882c6ea16c9f6c61b4514cc 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaProbelist.py
@@ -9,132 +9,132 @@
 
 #Tag items
 triggerTags = [ 
-  'HLT_e24_lhmedium_iloose_L1EM18VH',
-  'HLT_e24_lhmedium_iloose_L1EM20VH',
-  'HLT_e24_lhtight_iloose',
-  'HLT_e26_lhtight_iloose',
-  # Primary cut-based electron triggers
-  'HLT_e24_medium_iloose_L1EM18VH',
-  'HLT_e24_medium_iloose_L1EM20VH',
-  'HLT_e24_tight_iloose',
-  'HLT_e26_tight_iloose'
-]
+        'HLT_e24_lhmedium_iloose_L1EM18VH',
+        'HLT_e24_lhmedium_iloose_L1EM20VH',
+        'HLT_e24_lhtight_iloose',
+        'HLT_e26_lhtight_iloose',
+        # Primary cut-based electron triggers
+        'HLT_e24_medium_iloose_L1EM18VH',
+        'HLT_e24_medium_iloose_L1EM20VH',
+        'HLT_e24_tight_iloose',
+        'HLT_e26_tight_iloose'
+        ]
 
 
 monitoring_mam = {
-  'primary_single_ele'      : 'HLT_e26_lhtight_iloose',
-  'primary_single_cut_ele'  : 'HLT_e24_tight_iloose',
-  'primary_single_pho'      : 'HLT_g120_loose'}
+        'primary_single_ele'      : 'HLT_e26_lhtight_iloose',
+        'primary_single_cut_ele'  : 'HLT_e24_tight_iloose',
+        'primary_single_pho'      : 'HLT_g120_loose'}
 
 # L1 Items
 monitoring_L1Calo = [
-  'L1_EM20VH',
-  'L1_EM20VHI']
+        'L1_EM20VH',
+        'L1_EM20VHI']
 
 # High pt electron triggers that cannot be monitored with TP Analysis
 monitoring_electron=[
-  'HLT_e60_lhmedium',
-  'HLT_e60_medium',
-  'HLT_e120_lhloose',
-  'HLT_e120_loose',
-  'HLT_e140_lhloose'
-]
+        'HLT_e60_lhmedium',
+        'HLT_e60_medium',
+        'HLT_e120_lhloose',
+        'HLT_e120_loose',
+        'HLT_e140_lhloose'
+        ]
 
 # Full list of monitoring for photons
 monitoring_photon=[
-  'HLT_g25_loose',
-  'HLT_g35_loose',
-  "HLT_g25_medium",
-  "HLT_g35_medium",
-  'HLT_g20_tight',
-  'HLT_g120_loose',
-  'HLT_g140_loose'
-]
+        'HLT_g25_loose',
+        'HLT_g35_loose',
+        "HLT_g25_medium",
+        "HLT_g35_medium",
+        'HLT_g20_tight',
+        'HLT_g120_loose',
+        'HLT_g140_loose'
+        ]
 
 # Lowest single electron triggers for TP analysis
 monitoringTP_electron =[
-  'HLT_e24_lhmedium_L1EM18VH',
-  'HLT_e24_lhmedium_L1EM20VH',
-  'HLT_e24_medium_L1EM20VH',
-  'HLT_e24_lhmedium_iloose',
-  'HLT_e24_medium_iloose',
-  'HLT_e24_lhmedium_nod0_iloose',
-  'HLT_e24_lhtight_iloose',
-  'HLT_e24_tight_iloose',
-  'HLT_e26_lhtight_iloose',
-  'HLT_e26_lhtight_nod0_iloose',
-  'HLT_e26_lhtight_nod0_ivarloose',
-  'HLT_e26_lhtight_nod0_ringer_iloose',
-  'HLT_e26_lhtight_nod0_ringer_ivarloose',
-  'HLT_e28_lhtight_nod0_iloose',
-]
+        'HLT_e24_lhmedium_L1EM18VH',
+        'HLT_e24_lhmedium_L1EM20VH',
+        'HLT_e24_medium_L1EM20VH',
+        'HLT_e24_lhmedium_iloose',
+        'HLT_e24_medium_iloose',
+        'HLT_e24_lhmedium_nod0_iloose',
+        'HLT_e24_lhtight_iloose',
+        'HLT_e24_tight_iloose',
+        'HLT_e26_lhtight_iloose',
+        'HLT_e26_lhtight_nod0_iloose',
+        'HLT_e26_lhtight_nod0_ivarloose',
+        'HLT_e26_lhtight_nod0_ringer_iloose',
+        'HLT_e26_lhtight_nod0_ringer_ivarloose',
+        'HLT_e28_lhtight_nod0_iloose',
+        ]
 
 #Zee TP triggers
 monitoringTP_electronZee = [
-  'HLT_e24_lhtight_L1EM20VH_e15_etcut_Zee',
-  'HLT_e26_lhtight_e15_etcut_Zee',
-]
+        'HLT_e24_lhtight_L1EM20VH_e15_etcut_Zee',
+        'HLT_e26_lhtight_e15_etcut_Zee',
+        ]
 
 #Jpsiee TP triggers
 monitoringTP_electronJpsiee = [
-  "HLT_e5_loose",
-  "HLT_e5_lhloose",
-  "HLT_e5_vloose",
-  "HLT_e5_lhvloose",
-]
+        "HLT_e5_loose",
+        "HLT_e5_lhloose",
+        "HLT_e5_vloose",
+        "HLT_e5_lhvloose",
+        ]
 
 default = [
-  'HLT_e24_lhmedium_iloose_L1EM18VH',# Primary LH electron triggers
-  'HLT_e24_lhmedium_iloose_L1EM20VH',
-  'HLT_e24_lhtight_iloose',
-  'HLT_e24_lhtight_iloose_L1EM20VH',
-  'HLT_e26_lhtight_iloose',
-  'HLT_e26_lhtight_smooth_iloose',
-  'HLT_e60_lhmedium',
-  'HLT_e120_lhloose',
-  'HLT_e140_lhloose',
-  # Primary cut-based electron triggers
-  'HLT_e24_medium_iloose_L1EM18VH',
-  'HLT_e24_medium_iloose_L1EM20VH',
-  'HLT_e24_tight_iloose',
-  'HLT_e26_tight_iloose',
-  'HLT_e60_medium',
-  'HLT_e120_loose',
-  'HLT_e140_loose',
-  # Non-isolated
-  'HLT_e24_lhmedium_L1EM18VH',
-  'HLT_e24_medium_L1EM18VH',
-  'HLT_e24_lhtight_L1EM20VH',
-  'HLT_e24_tight_L1EM20VH',
-  'HLT_e24_lhmedium_L1EM20VHI',
-  # Single photon
-  'HLT_g120_loose',
-  'HLT_g140_loose',
-  # Suppporting triggers for alignment studies / LH ineffiency
-  'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH',
-  'HLT_e24_lhmedium_nod0_iloose_L1EM18VH',
-  'HLT_e24_lhmedium_nodeta_iloose_L1EM18VH',
-  'HLT_e24_lhmedium_nodphires_iloose_L1EM18VH',
-  'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH',
-  'HLT_e24_lhmedium_nod0_iloose_L1EM20VH',
-  'HLT_e24_lhmedium_nodeta_iloose_L1EM20VH',
-  'HLT_e24_lhmedium_nodphires_iloose_L1EM20VH',
-  'HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH',
-  'HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH',
-  'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM18VH',
-  'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM20VH',
-  'HLT_e26_lhtight_cutd0dphideta_iloose',
-  'HLT_e26_lhtight_iloose_HLTCalo',
-  'HLT_e26_lhtight_iloose_L2EFCalo',
-  'HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH',
-  'HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH',
-  'HLT_e60_lhmedium_HLTCalo',
-  'HLT_e60_lhmedium_L2EFCalo',
-  'HLT_e60_lhmedium_nod0',
-  'HLT_e60_lhmedium_cutd0dphideta',
-  # Supporting trigger for background
-  #'HLT_e24_vloose_L1EM18VH', 
-  #'HLT_e24_vloose_L1EM20VH',  
+        'HLT_e24_lhmedium_iloose_L1EM18VH',# Primary LH electron triggers
+        'HLT_e24_lhmedium_iloose_L1EM20VH',
+        'HLT_e24_lhtight_iloose',
+        'HLT_e24_lhtight_iloose_L1EM20VH',
+        'HLT_e26_lhtight_iloose',
+        'HLT_e26_lhtight_smooth_iloose',
+        'HLT_e60_lhmedium',
+        'HLT_e120_lhloose',
+        'HLT_e140_lhloose',
+        # Primary cut-based electron triggers
+        'HLT_e24_medium_iloose_L1EM18VH',
+        'HLT_e24_medium_iloose_L1EM20VH',
+        'HLT_e24_tight_iloose',
+        'HLT_e26_tight_iloose',
+        'HLT_e60_medium',
+        'HLT_e120_loose',
+        'HLT_e140_loose',
+        # Non-isolated
+        'HLT_e24_lhmedium_L1EM18VH',
+        'HLT_e24_medium_L1EM18VH',
+        'HLT_e24_lhtight_L1EM20VH',
+        'HLT_e24_tight_L1EM20VH',
+        'HLT_e24_lhmedium_L1EM20VHI',
+        # Single photon
+        'HLT_g120_loose',
+        'HLT_g140_loose',
+        # Suppporting triggers for alignment studies / LH ineffiency
+        'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH',
+        'HLT_e24_lhmedium_nod0_iloose_L1EM18VH',
+        'HLT_e24_lhmedium_nodeta_iloose_L1EM18VH',
+        'HLT_e24_lhmedium_nodphires_iloose_L1EM18VH',
+        'HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH',
+        'HLT_e24_lhmedium_nod0_iloose_L1EM20VH',
+        'HLT_e24_lhmedium_nodeta_iloose_L1EM20VH',
+        'HLT_e24_lhmedium_nodphires_iloose_L1EM20VH',
+        'HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH',
+        'HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH',
+        'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM18VH',
+        'HLT_e24_lhmedium_iloose_L2EFCalo_L1EM20VH',
+        'HLT_e26_lhtight_cutd0dphideta_iloose',
+        'HLT_e26_lhtight_iloose_HLTCalo',
+        'HLT_e26_lhtight_iloose_L2EFCalo',
+        'HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH',
+        'HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH',
+        'HLT_e60_lhmedium_HLTCalo',
+        'HLT_e60_lhmedium_L2EFCalo',
+        'HLT_e60_lhmedium_nod0',
+        'HLT_e60_lhmedium_cutd0dphideta',
+        # Supporting trigger for background
+        #'HLT_e24_vloose_L1EM18VH', 
+#'HLT_e24_vloose_L1EM20VH',  
   #'HLT_e24_lhvloose_L1EM18VH', 
   #'HLT_e24_lhvloose_L1EM20VH',  
   #'HLT_e26_lhvloose_L1EM20VH',
@@ -150,7 +150,7 @@ default = [
   'HLT_e17_loose_L1EM15',
   'HLT_e17_lhloose_L1EM15',
   'HLT_e13_etcut_trkcut',
-	# Rerun mode for photon
+        # Rerun mode for photon
   # Performance and supporting triggers 
   #"HLT_g0_perf_L1EM3_EMPTY",
   #"HLT_e0_perf_L1EM3_EMPTY",
@@ -193,190 +193,190 @@ default = [
 # Samples to run - Zee and a background such as dijet or JF17 or any JF sample
 
 probeListLowMidPtSupportingTriggers = [
-	"HLT_e0_L2Star_perf_L1EM15",
-	"HLT_e0_L2Star_perf_L1EM3",
-	"HLT_e0_perf_L1EM15",
-	"HLT_e0_perf_L1EM3",
-	"HLT_e10_etcut_L1EM7",
-	"HLT_e13_etcut_L1EM10_W-MT25",
-	"HLT_e13_etcut_L1EM10_W-MT30",
-	"HLT_e13_etcut_L1W-NOMATCH",
-	"HLT_e13_etcut_L1W-NOMATCH_W-05RO-XEEMHT",
-	"HLT_e13_etcut_trkcut",
-	"HLT_e14_etcut",
-	"HLT_e17_etcut_L1EM15",
-	"HLT_e17_etcut_L2StarA_L1EM15",
-	"HLT_e17_etcut_L2StarB_L1EM15",
-	"HLT_e17_etcut_L2StarC_L1EM15",
-	"HLT_e17_etcut_L2Star_idperf_L1EM15",
-	"HLT_e17_etcut_idperf_L1EM15",
-	"HLT_e18_etcut_L1EM15_W-MT35",
-	"HLT_e18_etcut_trkcut",
-	"HLT_e20_etcut_L1EM12",
-	"HLT_e30_etcut_L1EM15",
-	"HLT_e3_etcut",
-	"HLT_e3_etcut_L1EM3_EMPTY",
-	"HLT_e4_etcut",
-	"HLT_e5_etcut",
-	"HLT_e9_etcut",
-  "HLT_e24_etcut",
-  "HLT_e25_etcut_L1EM15",
-]
+        "HLT_e0_L2Star_perf_L1EM15",
+        "HLT_e0_L2Star_perf_L1EM3",
+        "HLT_e0_perf_L1EM15",
+        "HLT_e0_perf_L1EM3",
+        "HLT_e10_etcut_L1EM7",
+        "HLT_e13_etcut_L1EM10_W-MT25",
+        "HLT_e13_etcut_L1EM10_W-MT30",
+        "HLT_e13_etcut_L1W-NOMATCH",
+        "HLT_e13_etcut_L1W-NOMATCH_W-05RO-XEEMHT",
+        "HLT_e13_etcut_trkcut",
+        "HLT_e14_etcut",
+        "HLT_e17_etcut_L1EM15",
+        "HLT_e17_etcut_L2StarA_L1EM15",
+        "HLT_e17_etcut_L2StarB_L1EM15",
+        "HLT_e17_etcut_L2StarC_L1EM15",
+        "HLT_e17_etcut_L2Star_idperf_L1EM15",
+        "HLT_e17_etcut_idperf_L1EM15",
+        "HLT_e18_etcut_L1EM15_W-MT35",
+        "HLT_e18_etcut_trkcut",
+        "HLT_e20_etcut_L1EM12",
+        "HLT_e30_etcut_L1EM15",
+        "HLT_e3_etcut",
+        "HLT_e3_etcut_L1EM3_EMPTY",
+        "HLT_e4_etcut",
+        "HLT_e5_etcut",
+        "HLT_e9_etcut",
+        "HLT_e24_etcut",
+        "HLT_e25_etcut_L1EM15",
+        ]
 
 # ProbeList 2 Low/mid pt physics triggers
 # EmulationTool,Eff,Counts,Perf
 # Samples to run Zee and any background sample dijet, JFXX
 probeListLowMidPtPhysicsTriggers = [
-	"HLT_e10_lhvloose_L1EM7",
-	"HLT_e10_vloose_L1EM7",
-	"HLT_e12_lhloose",
-	"HLT_e12_loose",
-	"HLT_e12_lhvloose_L1EM10VH",
-	"HLT_e12_vloose_L1EM10VH",
-	"HLT_e15_lhloose_L1EM13VH",
-	"HLT_e15_lhvloose_L1EM13VH",
-	"HLT_e15_lhvloose_L1EM7",
-	"HLT_e15_loose_L1EM13VH",
-	"HLT_e15_vloose_L1EM13VH",
-	"HLT_e15_vloose_L1EM7",
-	"HLT_e17_lhloose",
-	"HLT_e17_lhmedium",
-	"HLT_e17_lhmedium_iloose",
-	"HLT_e17_lhvloose",
-	"HLT_e17_loose",
-	"HLT_e17_medium",
-	"HLT_e17_medium_iloose",
-	"HLT_e17_vloose",
-	"HLT_e20_lhmedium",
-	"HLT_e20_lhvloose",
-	"HLT_e20_medium",
-	"HLT_e20_vloose",
-	"HLT_e20_vloose_L1EM12",
-	"HLT_e24_lhmedium_L1EM15VH",
-	"HLT_e24_lhmedium_L1EM18VH",
-	"HLT_e24_lhmedium_iloose_L1EM18VH",
-	"HLT_e24_lhmedium_iloose_L1EM20VH",
-	"HLT_e24_lhtight_iloose",
-	"HLT_e24_lhvloose_L1EM18VH",
-	"HLT_e24_lhvloose_L1EM20VH",
-	"HLT_e24_medium_L1EM15VH",
-	"HLT_e24_medium_L1EM18VH",
-	"HLT_e24_medium_iloose_L1EM18VH",
-	"HLT_e24_medium_iloose_L1EM20VH",
-	"HLT_e24_tight_L1EM20VH",
-	"HLT_e24_tight_iloose",
-	"HLT_e24_vloose_L1EM18VH",
-	"HLT_e24_vloose_L1EM20VH",
-	"HLT_e25_lhvloose_L1EM15",
-	"HLT_e25_vloose_L1EM15",
-	"HLT_e26_lhtight_iloose",
-	"HLT_e26_lhvloose_L1EM20VH",
-	"HLT_e26_tight_iloose",
-	"HLT_e26_vloose_L1EM20VH",
-	"HLT_e30_lhvloose_L1EM15",
-	"HLT_e30_vloose_L1EM15",
-]
+        "HLT_e10_lhvloose_L1EM7",
+        "HLT_e10_vloose_L1EM7",
+        "HLT_e12_lhloose",
+        "HLT_e12_loose",
+        "HLT_e12_lhvloose_L1EM10VH",
+        "HLT_e12_vloose_L1EM10VH",
+        "HLT_e15_lhloose_L1EM13VH",
+        "HLT_e15_lhvloose_L1EM13VH",
+        "HLT_e15_lhvloose_L1EM7",
+        "HLT_e15_loose_L1EM13VH",
+        "HLT_e15_vloose_L1EM13VH",
+        "HLT_e15_vloose_L1EM7",
+        "HLT_e17_lhloose",
+        "HLT_e17_lhmedium",
+        "HLT_e17_lhmedium_iloose",
+        "HLT_e17_lhvloose",
+        "HLT_e17_loose",
+        "HLT_e17_medium",
+        "HLT_e17_medium_iloose",
+        "HLT_e17_vloose",
+        "HLT_e20_lhmedium",
+        "HLT_e20_lhvloose",
+        "HLT_e20_medium",
+        "HLT_e20_vloose",
+        "HLT_e20_vloose_L1EM12",
+        "HLT_e24_lhmedium_L1EM15VH",
+        "HLT_e24_lhmedium_L1EM18VH",
+        "HLT_e24_lhmedium_iloose_L1EM18VH",
+        "HLT_e24_lhmedium_iloose_L1EM20VH",
+        "HLT_e24_lhtight_iloose",
+        "HLT_e24_lhvloose_L1EM18VH",
+        "HLT_e24_lhvloose_L1EM20VH",
+        "HLT_e24_medium_L1EM15VH",
+        "HLT_e24_medium_L1EM18VH",
+        "HLT_e24_medium_iloose_L1EM18VH",
+        "HLT_e24_medium_iloose_L1EM20VH",
+        "HLT_e24_tight_L1EM20VH",
+        "HLT_e24_tight_iloose",
+        "HLT_e24_vloose_L1EM18VH",
+        "HLT_e24_vloose_L1EM20VH",
+        "HLT_e25_lhvloose_L1EM15",
+        "HLT_e25_vloose_L1EM15",
+        "HLT_e26_lhtight_iloose",
+        "HLT_e26_lhvloose_L1EM20VH",
+        "HLT_e26_tight_iloose",
+        "HLT_e26_vloose_L1EM20VH",
+        "HLT_e30_lhvloose_L1EM15",
+        "HLT_e30_vloose_L1EM15",
+        ]
 
 # Compare LHTrigger to IsEMTrigger
 probeListLHTriggers = [
-  "HLT_e10_lhvloose_L1EM7",
-  "HLT_e12_lhloose",
-  "HLT_e17_lhloose",
-  "HLT_e17_lhmedium",
-  "HLT_e17_lhmedium_iloose",
-  "HLT_e17_lhvloose",
-  "HLT_e20_lhmedium",
-  "HLT_e20_lhvloose",
-  "HLT_e24_lhtight_iloose",
-  "HLT_e26_lhtight_iloose",
-  "HLT_e30_lhvloose_L1EM15",
-  "HLT_e60_lhmedium",
-]
+        "HLT_e10_lhvloose_L1EM7",
+        "HLT_e12_lhloose",
+        "HLT_e17_lhloose",
+        "HLT_e17_lhmedium",
+        "HLT_e17_lhmedium_iloose",
+        "HLT_e17_lhvloose",
+        "HLT_e20_lhmedium",
+        "HLT_e20_lhvloose",
+        "HLT_e24_lhtight_iloose",
+        "HLT_e26_lhtight_iloose",
+        "HLT_e30_lhvloose_L1EM15",
+        "HLT_e60_lhmedium",
+        ]
 
 # Compare with LH trigger above
 probeListIsEMTriggers = [
-  "HLT_e10_vloose_L1EM7",
-  "HLT_e12_loose",
-  "HLT_e17_loose",
-	"HLT_e17_medium",
-	"HLT_e17_medium_iloose",
-  "HLT_e17_vloose",
-	"HLT_e20_medium",
-	"HLT_e20_vloose",
-  "HLT_e24_tight_iloose",
-  "HLT_e26_tight_iloose",
-  "HLT_e30_vloose_L1EM15",
-  "HLT_e60_medium",
-]
+        "HLT_e10_vloose_L1EM7",
+        "HLT_e12_loose",
+        "HLT_e17_loose",
+        "HLT_e17_medium",
+        "HLT_e17_medium_iloose",
+        "HLT_e17_vloose",
+        "HLT_e20_medium",
+        "HLT_e20_vloose",
+        "HLT_e24_tight_iloose",
+        "HLT_e26_tight_iloose",
+        "HLT_e30_vloose_L1EM15",
+        "HLT_e60_medium",
+        ]
 
 # Compare with same items without L1 seed
 probeListAltL1Seeds = [
-	"HLT_e12_lhloose_L1EM10VH",
-  "HLT_e12_loose_L1EM10VH",
-  "HLT_e17_lhloose_L1EM15",
-  "HLT_e17_loose_L1EM15",
-  "HLT_e20_lhvloose_L1EM12",
-  "HLT_e24_lhtight_L1EM20VH",
-	"HLT_e24_lhtight_iloose_L1EM20VH",
-	"HLT_e24_tight_iloose_L1EM20VH",
-	"HLT_e24_tight_iloose_etisem_L1EM20VH",
-]
+        "HLT_e12_lhloose_L1EM10VH",
+        "HLT_e12_loose_L1EM10VH",
+        "HLT_e17_lhloose_L1EM15",
+        "HLT_e17_loose_L1EM15",
+        "HLT_e20_lhvloose_L1EM12",
+        "HLT_e24_lhtight_L1EM20VH",
+        "HLT_e24_lhtight_iloose_L1EM20VH",
+        "HLT_e24_tight_iloose_L1EM20VH",
+        "HLT_e24_tight_iloose_etisem_L1EM20VH",
+        ]
 
 # Special triggers for hlt id performance
 probeListPerfTriggers = [
-	"HLT_e24_lhmedium_L2Star_idperf_L1EM20VH",
-	"HLT_e24_lhmedium_idperf_L1EM20VH",
-  "HLT_e24_medium1_L2Star_idperf_L1EM18VH",
-  "HLT_e24_medium1_idperf_L1EM18VH",
-  "HLT_e24_medium_L2Star_idperf_L1EM20VH",
-  "HLT_e24_medium_idperf_L1EM20VH",
-]
+        "HLT_e24_lhmedium_L2Star_idperf_L1EM20VH",
+        "HLT_e24_lhmedium_idperf_L1EM20VH",
+        "HLT_e24_medium1_L2Star_idperf_L1EM18VH",
+        "HLT_e24_medium1_idperf_L1EM18VH",
+        "HLT_e24_medium_L2Star_idperf_L1EM20VH",
+        "HLT_e24_medium_idperf_L1EM20VH",
+        ]
 
 # Run1 tracking triggers, for rate estimates
 # Compare with same triggers w/o L2StarA
 probeListRun1TrkTriggers = [
-  "HLT_e24_lhmedium_iloose_L2StarA_L1EM20VH",
-  "HLT_e24_medium1_iloose_L2StarA_L1EM18VH",
-  "HLT_e24_medium_iloose_L2StarA_L1EM20VH",
-]
+        "HLT_e24_lhmedium_iloose_L2StarA_L1EM20VH",
+        "HLT_e24_medium1_iloose_L2StarA_L1EM18VH",
+        "HLT_e24_medium_iloose_L2StarA_L1EM20VH",
+        ]
 
 # Run1 Pid, compare with same Run2 items
 probeListRun1PidTriggers = [
-	"HLT_e24_medium1_L1EM18VH",
-	"HLT_e24_medium1_iloose_L1EM18VH",
-	"HLT_e24_tight1_iloose",
-	"HLT_e24_tight1_iloose_L1EM20VH",
-  "HLT_e26_tight1_iloose",
-]
+        "HLT_e24_medium1_L1EM18VH",
+        "HLT_e24_medium1_iloose_L1EM18VH",
+        "HLT_e24_tight1_iloose",
+        "HLT_e24_tight1_iloose_L1EM20VH",
+        "HLT_e26_tight1_iloose",
+        ]
 
 # To be compared with the default items
 probeListMisalignmentTriggers = [
-	"HLT_e24_lhmedium_cutd0dphideta_L1EM18VH",
-	"HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH",
-	"HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH",
-	"HLT_e24_lhmedium_nod0_L1EM18VH",
-	"HLT_e24_lhmedium_nod0_iloose_L1EM18VH",
-	"HLT_e24_lhmedium_nodeta_L1EM18VH",
-	"HLT_e24_lhmedium_nodeta_iloose_L1EM18VH",
-	"HLT_e24_lhmedium_nodphires_L1EM18VH",
-	"HLT_e24_lhmedium_nodphires_iloose_L1EM18VH",
-	"HLT_e24_lhtight_cutd0dphideta_iloose",
-	"HLT_e24_lhtight_cutd0dphideta_iloose_L1EM20VH",
-  "HLT_e26_lhtight_cutd0dphideta_iloose",
-  "HLT_e60_lhmedium_cutd0dphideta",
-]
+        "HLT_e24_lhmedium_cutd0dphideta_L1EM18VH",
+        "HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM18VH",
+        "HLT_e24_lhmedium_cutd0dphideta_iloose_L1EM20VH",
+        "HLT_e24_lhmedium_nod0_L1EM18VH",
+        "HLT_e24_lhmedium_nod0_iloose_L1EM18VH",
+        "HLT_e24_lhmedium_nodeta_L1EM18VH",
+        "HLT_e24_lhmedium_nodeta_iloose_L1EM18VH",
+        "HLT_e24_lhmedium_nodphires_L1EM18VH",
+        "HLT_e24_lhmedium_nodphires_iloose_L1EM18VH",
+        "HLT_e24_lhtight_cutd0dphideta_iloose",
+        "HLT_e24_lhtight_cutd0dphideta_iloose_L1EM20VH",
+        "HLT_e26_lhtight_cutd0dphideta_iloose",
+        "HLT_e60_lhmedium_cutd0dphideta",
+        ]
 
 # Compare with default items
 probeListAltSequence = [
-	"HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH",
-	"HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH",
-	"HLT_e24_lhtight_iloose_HLTCalo",
-	"HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH",
-  "HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH",
-  "HLT_e24_tight_iloose_HLTCalo_L1EM20VH",
-  "HLT_e24_tight_iloose_L2EFCalo_L1EM20VH",
-  "HLT_e26_lhtight_iloose_HLTCalo",
-]
+        "HLT_e24_lhmedium_iloose_HLTCalo_L1EM18VH",
+        "HLT_e24_lhmedium_iloose_HLTCalo_L1EM20VH",
+        "HLT_e24_lhtight_iloose_HLTCalo",
+        "HLT_e24_lhtight_iloose_HLTCalo_L1EM20VH",
+        "HLT_e24_lhtight_iloose_L2EFCalo_L1EM20VH",
+        "HLT_e24_tight_iloose_HLTCalo_L1EM20VH",
+        "HLT_e24_tight_iloose_L2EFCalo_L1EM20VH",
+        "HLT_e26_lhtight_iloose_HLTCalo",
+        ]
 
 #ProbeList 3 High pt triggers
 #Should run with Zprime and / or WPrime samples
@@ -387,164 +387,164 @@ probeListAltSequence = [
 
 # Etcut Trigger list
 probeListHighPtSupportingTriggers = [
-	"HLT_e100_etcut",
-	"HLT_e120_etcut",
-	"HLT_e40_etcut_L1EM15",
-	"HLT_e60_etcut",
-	"HLT_e80_etcut",
-	"HLT_e50_etcut_L1EM15",
-]
+        "HLT_e100_etcut",
+        "HLT_e120_etcut",
+        "HLT_e40_etcut_L1EM15",
+        "HLT_e60_etcut",
+        "HLT_e80_etcut",
+        "HLT_e50_etcut_L1EM15",
+        ]
 
 # The Primary Trigger List
 probeListHighPtPhysicsTriggers = [
-	"HLT_e120_lhloose",
-	"HLT_e120_lhloose_HLTCalo",
-	"HLT_e120_lhvloose",
-	"HLT_e120_loose",
-	"HLT_e120_loose1",
-	"HLT_e120_vloose",
-	"HLT_e140_lhloose",
-	"HLT_e140_lhloose_HLTCalo",
-	"HLT_e140_loose",
-	"HLT_e40_lhvloose_L1EM15",
-	"HLT_e40_vloose_L1EM15",
-	"HLT_e50_lhvloose_L1EM15",
-	"HLT_e50_vloose_L1EM15",
-	"HLT_e60_lhloose",
-	"HLT_e60_lhmedium",
-	"HLT_e60_lhmedium_HLTCalo",
-	"HLT_e60_lhmedium_cutd0dphideta",
-	"HLT_e60_lhvloose",
-	"HLT_e60_loose",
-	"HLT_e60_medium",
-	"HLT_e60_medium1",
-	"HLT_e60_vloose",
-	"HLT_e70_lhloose",
-	"HLT_e70_lhvloose",
-	"HLT_e70_loose",
-	"HLT_e70_vloose",
-	"HLT_e80_lhvloose",
-	"HLT_e80_vloose",
-]
+        "HLT_e120_lhloose",
+        "HLT_e120_lhloose_HLTCalo",
+        "HLT_e120_lhvloose",
+        "HLT_e120_loose",
+        "HLT_e120_loose1",
+        "HLT_e120_vloose",
+        "HLT_e140_lhloose",
+        "HLT_e140_lhloose_HLTCalo",
+        "HLT_e140_loose",
+        "HLT_e40_lhvloose_L1EM15",
+        "HLT_e40_vloose_L1EM15",
+        "HLT_e50_lhvloose_L1EM15",
+        "HLT_e50_vloose_L1EM15",
+        "HLT_e60_lhloose",
+        "HLT_e60_lhmedium",
+        "HLT_e60_lhmedium_HLTCalo",
+        "HLT_e60_lhmedium_cutd0dphideta",
+        "HLT_e60_lhvloose",
+        "HLT_e60_loose",
+        "HLT_e60_medium",
+        "HLT_e60_medium1",
+        "HLT_e60_vloose",
+        "HLT_e70_lhloose",
+        "HLT_e70_lhvloose",
+        "HLT_e70_loose",
+        "HLT_e70_vloose",
+        "HLT_e80_lhvloose",
+        "HLT_e80_vloose",
+        ]
 
 # ProbeList 4 Photon triggers
 # EmulationTool,Perf
 # Sample ggH125 and background dijet / JFXX
 
 probeListPhotonTriggers = [
-	"HLT_g0_hiptrt_L1EM18VH",
-	"HLT_g0_hiptrt_L1EM20VH",
-	"HLT_g0_hiptrt_L1EM20VHI",
-	"HLT_g0_hiptrt_L1EM22VHI",
-	"HLT_g0_perf_L1EM15",
-	"HLT_g0_perf_L1EM3",
-	"HLT_g100_loose",
-	"HLT_g10_etcut",
-	"HLT_g10_loose",
-	"HLT_g10_medium",
-	"HLT_g120_loose",
-	"HLT_g120_loose1",
-	"HLT_g120_loose_HLTCalo",
-	"HLT_g140_loose",
-	"HLT_g15_loose",
-	"HLT_g15_loose_L1EM3",
-	"HLT_g15_loose_L1EM7",
-	"HLT_g200_etcut",
-	"HLT_g20_etcut_L1EM12",
-	"HLT_g20_loose",
-	"HLT_g20_loose_L1EM12",
-	"HLT_g20_loose_L1EM15",
-	"HLT_g20_tight",
-	"HLT_g25_loose",
-	"HLT_g25_loose_L1EM15",
-	"HLT_g25_medium",
-	"HLT_g35_loose",
-	"HLT_g35_loose_L1EM15",
-	"HLT_g35_loose_L1EM15_g25_loose_L1EM15",
-	"HLT_g35_loose_g25_loose",
-	"HLT_g35_medium",
-	"HLT_g3_etcut",
-	"HLT_g3_etcut_L1EM3_EMPTY",
-	"HLT_g40_loose_L1EM15",
-	"HLT_g40_tight",
-	"HLT_g45_loose_L1EM15",
-	"HLT_g45_tight",
-	"HLT_g50_loose",
-	"HLT_g50_loose_L1EM15",
-	"HLT_g60_loose",
-	"HLT_g60_loose_L1EM15VH",
-	"HLT_g70_loose",
-	"HLT_g80_loose",
-]
+        "HLT_g0_hiptrt_L1EM18VH",
+        "HLT_g0_hiptrt_L1EM20VH",
+        "HLT_g0_hiptrt_L1EM20VHI",
+        "HLT_g0_hiptrt_L1EM22VHI",
+        "HLT_g0_perf_L1EM15",
+        "HLT_g0_perf_L1EM3",
+        "HLT_g100_loose",
+        "HLT_g10_etcut",
+        "HLT_g10_loose",
+        "HLT_g10_medium",
+        "HLT_g120_loose",
+        "HLT_g120_loose1",
+        "HLT_g120_loose_HLTCalo",
+        "HLT_g140_loose",
+        "HLT_g15_loose",
+        "HLT_g15_loose_L1EM3",
+        "HLT_g15_loose_L1EM7",
+        "HLT_g200_etcut",
+        "HLT_g20_etcut_L1EM12",
+        "HLT_g20_loose",
+        "HLT_g20_loose_L1EM12",
+        "HLT_g20_loose_L1EM15",
+        "HLT_g20_tight",
+        "HLT_g25_loose",
+        "HLT_g25_loose_L1EM15",
+        "HLT_g25_medium",
+        "HLT_g35_loose",
+        "HLT_g35_loose_L1EM15",
+        "HLT_g35_loose_L1EM15_g25_loose_L1EM15",
+        "HLT_g35_loose_g25_loose",
+        "HLT_g35_medium",
+        "HLT_g3_etcut",
+        "HLT_g3_etcut_L1EM3_EMPTY",
+        "HLT_g40_loose_L1EM15",
+        "HLT_g40_tight",
+        "HLT_g45_loose_L1EM15",
+        "HLT_g45_tight",
+        "HLT_g50_loose",
+        "HLT_g50_loose_L1EM15",
+        "HLT_g60_loose",
+        "HLT_g60_loose_L1EM15VH",
+        "HLT_g70_loose",
+        "HLT_g80_loose",
+        ]
 
 defaultJpsi=[
-  "HLT_e5_loose",
-  "HLT_e5_lhloose",
-  "HLT_e5_vloose",
-  "HLT_e5_lhvloose",
-]
+        "HLT_e5_loose",
+        "HLT_e5_lhloose",
+        "HLT_e5_vloose",
+        "HLT_e5_lhvloose",
+        ]
 
 
 # Lowest single electron triggers for TP analysis
 monitoringTP_electron_extra =[
-  'HLT_e24_lhmedium_L1EM18VH',
-  'HLT_e24_lhmedium_nod0_L1EM18VH',
-  'HLT_e24_lhmedium_nod0_L1EM20VH',
-  'HLT_e24_medium_nod0_L1EM20VH',
-  'HLT_e24_lhmedium_iloose',
-  'HLT_e24_medium_iloose',
-  'HLT_e24_lhmedium_nod0_iloose',
-  'HLT_e24_lhtight_nod0_iloose',
-  'HLT_e24_lhmedium_nod0_ivarloose',
-  'HLT_e24_lhtight_nod0_ivarloose',
-  'HLT_e24_lhtight_iloose',
-  'HLT_e24_tight_iloose',
-  'HLT_e26_lhtight_iloose',
-  'HLT_e26_lhtight_nod0_iloose',
-  'HLT_e26_lhtight_nod0_ivarloose',
-  'HLT_e24_lhmedium_nod0_ringer_L1EM20VH',
-  'HLT_e24_lhmedium_nod0_ringer_iloose',
-  'HLT_e24_lhtight_nod0_ringer_iloose',
-  'HLT_e24_lhmedium_nod0_ringer_ivarloose',
-  'HLT_e24_lhtight_nod0_ringer_ivarloose',
-  'HLT_e26_lhtight_nod0_ringer_iloose',
-  'HLT_e26_lhtight_nod0_ringer_ivarloose',
-  'HLT_e28_lhtight_nod0_iloose',
-  'HLT_e28_lhtight_nod0_ringer_iloose',
-  'HLT_e28_lhtight_nod0_ringer_ivarloose',
-]
+        'HLT_e24_lhmedium_L1EM18VH',
+        'HLT_e24_lhmedium_nod0_L1EM18VH',
+        'HLT_e24_lhmedium_nod0_L1EM20VH',
+        'HLT_e24_medium_nod0_L1EM20VH',
+        'HLT_e24_lhmedium_iloose',
+        'HLT_e24_medium_iloose',
+        'HLT_e24_lhmedium_nod0_iloose',
+        'HLT_e24_lhtight_nod0_iloose',
+        'HLT_e24_lhmedium_nod0_ivarloose',
+        'HLT_e24_lhtight_nod0_ivarloose',
+        'HLT_e24_lhtight_iloose',
+        'HLT_e24_tight_iloose',
+        'HLT_e26_lhtight_iloose',
+        'HLT_e26_lhtight_nod0_iloose',
+        'HLT_e26_lhtight_nod0_ivarloose',
+        'HLT_e24_lhmedium_nod0_ringer_L1EM20VH',
+        'HLT_e24_lhmedium_nod0_ringer_iloose',
+        'HLT_e24_lhtight_nod0_ringer_iloose',
+        'HLT_e24_lhmedium_nod0_ringer_ivarloose',
+        'HLT_e24_lhtight_nod0_ringer_ivarloose',
+        'HLT_e26_lhtight_nod0_ringer_iloose',
+        'HLT_e26_lhtight_nod0_ringer_ivarloose',
+        'HLT_e28_lhtight_nod0_iloose',
+        'HLT_e28_lhtight_nod0_ringer_iloose',
+        'HLT_e28_lhtight_nod0_ringer_ivarloose',
+        ]
 
 
 ### Make supproting trigger list for the emulation e/g tool
 supportingTriggerList = probeListLowMidPtSupportingTriggers+probeListHighPtSupportingTriggers
 # Update the supporting list with very loose chains. This will be used in data collisin matches
 for trig in probeListLowMidPtPhysicsTriggers+probeListHighPtPhysicsTriggers:
-  if 'vloose' in trig:  supportingTriggerList.append(trig)
+    if 'vloose' in trig:  supportingTriggerList.append(trig)
 
 supportingTriggerList.extend( [
-  'HLT_e24_lhvloose_nod0_L1EM20VH',
-  'HLT_e26_lhvloose_nod0_L1EM20VH',
-  'HLT_e28_lhvloose_nod0_L1EM20VH',
-  'HLT_e140_lhvloose_nod0',
-  'HLT_e10_lhvloose_nod0_L1EM7',
-  'HLT_e10_lhvloose_nod0_L1EM7',
-  'HLT_e15_lhvloose_nod0_L1EM7',
-  'HLT_e20_lhvloose_nod0_L1EM12',
-  'HLT_e25_lhvloose_nod0_L1EM15',
-  'HLT_e30_lhvloose_nod0_L1EM15',
-  'HLT_e40_lhvloose_nod0_L1EM15',
-  'HLT_e50_lhvloose_nod0_L1EM15',
-  'HLT_e70_lhvloose_nod0',
-  'HLT_e80_lhvloose_nod0',
-  'HLT_e100_lhvloose_nod0',
-  'HLT_e120_lhvloose_nod0',
-  'HLT_e5_lhvloose_nod0',
-  'HLT_e12_lhvloose_nod0_L1EM10VH',
-  'HLT_e17_lhvloose_nod0',
-  'HLT_e20_lhvloose_nod0',
-  'HLT_e40_lhvloose_nod0',
-  'HLT_e60_lhvloose_nod0',
-] )
+    'HLT_e24_lhvloose_nod0_L1EM20VH',
+    'HLT_e26_lhvloose_nod0_L1EM20VH',
+    'HLT_e28_lhvloose_nod0_L1EM20VH',
+    'HLT_e140_lhvloose_nod0',
+    'HLT_e10_lhvloose_nod0_L1EM7',
+    'HLT_e10_lhvloose_nod0_L1EM7',
+    'HLT_e15_lhvloose_nod0_L1EM7',
+    'HLT_e20_lhvloose_nod0_L1EM12',
+    'HLT_e25_lhvloose_nod0_L1EM15',
+    'HLT_e30_lhvloose_nod0_L1EM15',
+    'HLT_e40_lhvloose_nod0_L1EM15',
+    'HLT_e50_lhvloose_nod0_L1EM15',
+    'HLT_e70_lhvloose_nod0',
+    'HLT_e80_lhvloose_nod0',
+    'HLT_e100_lhvloose_nod0',
+    'HLT_e120_lhvloose_nod0',
+    'HLT_e5_lhvloose_nod0',
+    'HLT_e12_lhvloose_nod0_L1EM10VH',
+    'HLT_e17_lhvloose_nod0',
+    'HLT_e20_lhvloose_nod0',
+    'HLT_e40_lhvloose_nod0',
+    'HLT_e60_lhvloose_nod0',
+    ] )
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py
deleted file mode 100755
index 763707849410d0aec5a9e25fd905a847ef097379..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# Job options for standalone and Tier0 running of AnalysisTools 
-# Authors: 
-# Ryan Mackenzie White <ryan.white@cern.ch>
-# 
-# Tool and algorithm configuration done using egamma Factories
-# Default configurations found in TrigEgammaAnalysisToolsConfig
-
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'" -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from AthenaCommon.AppMgr import ToolSvc
-
-import os
-
-#print 'Set some variables for job'
-dirtouse = str()
-
-finallist=[]
-
-if 'FILE' in dir() :
-     finallist.append(FILE)
-elif 'DIR' in dir() :
-     dirtouse=DIR       
-     while( dirtouse.endswith('/') ) :
-          dirtouse= dirtouse.rstrip('/')
-     listfiles=os.listdir(dirtouse)
-     for ll in listfiles:
-          finallist.append(dirtouse+'/'+ll)
-
-if 'NOV' in dir():
-    nov=NOV
-else :
-    nov=-1
-
-if 'RTT' in dir():
-    rttfile='root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/rtt/prod/rtt/'+RTT+'/x86_64-slc6-gcc49-opt/offline/TrigEgammaValidation/RDOtoAOD_MC_transform_Zee_25ns_pileup/AOD.Zee.25ns.pileup.pool.root'
-    finallist.append(rttfile)
-
-if 'GRL' in dir():
-    grl=GRL
-
-
-athenaCommonFlags.FilesInput=finallist
-athenaCommonFlags.EvtMax=nov
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doMuonCombined=False
-rec.doWriteAOD=True
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False) # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(True) # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(True) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-MessageSvc.debugLimit = 20000000
-MessageSvc.infoLimit  = 20000000
-# TDT
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
-ToolSvc.TrigDecisionTool.TrigDecisionKey='xTrigDecision'
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Use GRL selection 
-if 'GRL' in dir():
-    # Configure the goodrunslist selector tool
-    from GoodRunsLists.GoodRunsListsConf import *
-    ToolSvc += GoodRunsListSelectorTool() 
-    GoodRunsListSelectorTool.GoodRunsListVec = [grl]
-    GoodRunsListSelectorTool.OutputLevel = DEBUG
-    from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-    topSequence = AlgSequence()
-    seq = AthSequencer("AthMasterSeq")
-    from GoodRunsListsUser.GoodRunsListsUserConf import *
-    seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-    seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good']        ## pick up correct name from inside xml file!
-
-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      = "HLT");
-
-#ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ HLTMon ];
-    
-from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig
-HLTEgammaMon = TrigEgammaMonToolConfig.TrigEgammaMonTool()
-HLTMonManager.AthenaMonTools += [ HLTEgammaMon ]
-HLTMonManager.FileKey = "GLOBAL"
-
-
-    
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py
deleted file mode 100755
index cb574e9530c73aca90ff1cd1c5632b68f6860cfd..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py
+++ /dev/null
@@ -1,200 +0,0 @@
-# Job options for standalone and Tier0 running of AnalysisTools 
-# Authors: 
-# Ryan Mackenzie White <ryan.white@cern.ch>
-# 
-# Tool and algorithm configuration done using egamma Factories
-# Default configurations found in TrigEgammaAnalysisToolsConfig
-
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'" -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.ConditionsTag="CONDBR2-BLKPA-2014-00"
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from InDetRecExample.InDetJobProperties import InDetFlags
-InDetFlags.doSecVertexFinder.set_Value_and_Lock(False)
-from AthenaCommon.AppMgr import ToolSvc
-
-import os
-
-# Use the parser
-import argparse
-#print 'Setup parser'
-parser = argparse.ArgumentParser()
-#parser.add_argument("--file", action="store",help="input file name")
-#parser.add_argument("--dirname", action="store",help="input directory")
-#parser.add_argument("--nev",default=-1,action=store,type=int,help="number of events to process")
-#parser.add_argument("--output",default="Validation",action=store,help="output file name")
-#parser.add_argument("--t0",default=False,action=store_true,help="run T0 monitoring")
-#parser.add_argument("--tagTrigger",default="e26_lhtight_iloose",action=store,help="Tag trigger to TP")
-#parser.add_argument("--useMCMenu",default=False,action=store_true,help="Use MC menu to generate trigger list")
-#parser.add_argument("--usePhysicsMenu",default=False,action=store_true,help="Use MC menu to generate trigger list")
-
-#print 'Set some variables for job'
-dirtouse = str()
-
-finallist=[]
-#print 'Now parser'
-#args = parser.parse_args()
-#print 'Now setup filelist'
-#finallist.append(args.file)
-#print 'Or set the directory'
-#dirtouse=args.dirname
-#nov=args.nev
-#while( dirtouse.endswith('/') ) :
-#    dirtouse= dirtouse.rstrip('/')
-#    listfiles=os.listdir(dirtouse)
-#    for ll in listfiles:
-#        finallist.append(dirtouse+'/'+ll)
-#outputName = args.output
-#tagItem = args.Tagtrigger
-
-if 'FILE' in dir() :
-     finallist.append(FILE)
-elif 'DIR' in dir() :
-     dirtouse=DIR       
-     while( dirtouse.endswith('/') ) :
-          dirtouse= dirtouse.rstrip('/')
-     listfiles=os.listdir(dirtouse)
-     for ll in listfiles:
-          finallist.append(dirtouse+'/'+ll)
-
-if 'NOV' in dir():
-    nov=NOV
-else :
-    nov=-1
-
-if 'OUTPUT' in dir():
-    outputName = OUTPUT
-elif 'DOTIER0' in dir():
-    outputName = ''
-else:
-    outputName = 'Validation'
-
-if('TAG' in dir()):
-    tagItem = TAG 
-else: 
-    tagItem = 'e26_tight_iloose'
-
-
-athenaCommonFlags.FilesInput=finallist
-athenaCommonFlags.EvtMax=nov
-#athenaCommonFlags.EvtMax=-1
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doMuonCombined=False
-rec.doWriteAOD=False
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-
-
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False) # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(False) # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(False) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-
-# TDT
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
-ToolSvc.TrigDecisionTool.TrigDecisionKey='xTrigDecision'
-
-# Configure the goodrunslist selector tool
-from GoodRunsLists.GoodRunsListsConf import *
-ToolSvc += GoodRunsListSelectorTool() 
-GoodRunsListSelectorTool.GoodRunsListVec = ['data15_13TeV.periodAllYear_DetStatus-v63-pro18-01_DQDefects-00-01-02_PHYS_StandardGRL_All_Good.xml']
-GoodRunsListSelectorTool.OutputLevel = DEBUG
-# Set base path for monitoring/validation tools        
-basePath = '/HLT/Egamma/'
-
-if 'DOTIER0' in dir():
-    from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-    topSequence = AlgSequence()
-    seq = AthSequencer("AthMasterSeq")
-    from GoodRunsListsUser.GoodRunsListsUserConf import *
-    seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-    seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good']        ## pick up correct name from inside xml file!
-    
-    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      = "HLT");
-
-
-    #ToolSvc += HLTMon;
-    HLTMonManager.AthenaMonTools += [ HLTMon ];
-    
-    from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig
-    TrigEgammaMonTool = TrigEgammaMonToolConfig.TrigEgammaMonTool()
-    HLTMonManager.AthenaMonTools += [ TrigEgammaMonTool ]
-    HLTMonManager.FileKey = "GLOBAL"
-
-elif 'DO50ns' in dir():
-    from AthenaCommon.AlgSequence import AlgSequence,AthSequencer
-    topSequence = AlgSequence()
-    seq = AthSequencer("AthMasterSeq")
-    from GoodRunsListsUser.GoodRunsListsUserConf import *
-    seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-    seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good']        ## pick up correct name from inside xml file!
-
-    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      = "HLT");
-
-
-    #ToolSvc += HLTMon;
-    HLTMonManager.AthenaMonTools += [ HLTMon ];
-    
-    from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig50ns
-    TrigEgammaMonTool = TrigEgammaMonToolConfig50ns.TrigEgammaMonTool()
-    HLTMonManager.AthenaMonTools += [ TrigEgammaMonTool ]
-    HLTMonManager.FileKey = "GLOBAL"
-elif 'DOPHYSVAL' in dir():
-    from AthenaCommon.AlgSequence import AlgSequence
-    topSequence = AlgSequence()
-    
-    from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-    monMan= AthenaMonManager( "PhysValMonManager")
-    monMan.FileKey = "PhysVal"
-    topSequence += monMan
-
-    from GaudiSvc.GaudiSvcConf import THistSvc
-    ServiceMgr += THistSvc()
-    
-    ServiceMgr.THistSvc.Output += ["PhysVal DATAFILE='PhysVal.root' OPT='RECREATE'"]
-    from TrigEgammaAnalysisTools import TrigEgammaPhysValMonToolConfig
-    TrigEgammaPhysValMonToolConfig.TrigEgammaPhysValMonTool()
-    monMan.AthenaMonTools += [ "TrigEgammaPhysValMonTool" ]
-else:
-   print "No job configured, options DOPHYSVAL=True or DOTIER0=True" 
-    
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools_emulator.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools_emulator.py
deleted file mode 100644
index d935bbb645d21ee20a9cba0f024667550a5fbdc8..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools_emulator.py
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-####################################################################################################
-# Job options for standalone and Tier0 running of AnalysisTools 
-# Authors: 
-# Ryan Mackenzie White <ryan.white@cern.ch>
-# Joao Victor Pinto    <jodafons@cern.ch>
-# 
-# Tool and algorithm configuration done using egamma Factories
-#
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/\
-#                     valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'" 
-#                 -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-####################################################################################################
-
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from AthenaCommon.AppMgr import ToolSvc
-import os
-
-# Define triggers for tagging 
-tagList = ['HLT_e24_lhtight_nod0_ivarloose',
-           'HLT_e26_lhtight_nod0_ivarloose',
-           'HLT_e28_lhtight_nod0_ivarloose']
-
-triggerList_commissioning_v1 = [
-          
-         # standard monitoring chains
-         #'HLT_e17_lhvloose_nod0_L1EM15VHI',
-         'HLT_e17_lhvloose_nod0',
-         'HLT_e26_lhloose_nod0',
-         'HLT_e26_lhmedium_nod0',
-         #'HLT_e26_lhtight_nod0',
-         #'HLT_e26_lhtight_nod0_ivarloose',
-         'HLT_e28_lhtight_nod0_ivarloose',
-         'HLT_e60_lhmedium_nod0_L1EM24VHI',
-         'HLT_e140_lhloose_nod0_L1EM24VHI',
-         # ringer chains for the commissioning...
-         #'HLT_e17_lhvloose_nod0_ringer_L1EM15VHI',
-         'HLT_e17_lhvloose_nod0_ringer',
-         'HLT_e26_lhloose_nod0_ringer',
-         'HLT_e26_lhmedium_nod0_ringer',
-         #'HLT_e26_lhtight_nod0_ringer',
-         #'HLT_e26_lhtight_nod0_ringer_ivarloose',
-         'HLT_e28_lhtight_nod0_ringer_ivarloose',
-         'HLT_e60_lhmedium_nod0_ringer_L1EM24VHI',
-         'HLT_e140_lhloose_nod0_ringer_L1EM24VHI',
-    ]
-
-
-triggerList_monitoring_v1 = [
-         # standard monitoring chains
-         'HLT_e17_lhvloose_nod0_L1EM15VHI',
-         'HLT_e26_lhtight_nod0_ivarloose',
-         'HLT_e28_lhtight_nod0_icaloloose',
-         'HLT_e60_lhmedium_nod0_L1EM24VHI',
-         'HLT_e140_lhloose_nod0_L1EM24VHI',
-         # no ringer chains for pos-commissioning...
-         'HLT_e17_lhvloose_nod0_noringer_L1EM15VHI',
-         'HLT_e26_lhtight_nod0_noringer_ivarloose',
-         'HLT_e28_lhtight_nod0_noringer_ivarloose',
-         'HLT_e60_lhmedium_nod0_noringer_L1EM24VHI',
-         'HLT_e140_lhloose_nod0_noringer_L1EM24VHI',
-
-      ]
-
-
-triggerList = triggerList_monitoring_v1
-
-doGRL=False
-doEmulation=True
-DetailedHistograms=False
-####################################################################################################
-dirtouse = str()
-finallist=[]
-grllist=[]
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
-from glob import glob
-
-if ('FILE' in dir()):
-    acf.FilesInput=[FILE]
-elif ('DIR' in dir()):
-    inputFiles = glob(DIR+'*')
-    acf.FilesInput=inputFiles
-if 'NOV' in dir():
-    nov=NOV
-else :
-    nov=500
-if 'GRL' in dir():
-  grllist.append(GRL)
-else:
-  #grllist.append('/afs/cern.ch/work/j/jodafons/public/data/data15_13TeV.periodAllYear_DetStatus-v79-repro20-02_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
-  #grllist.append('data15_13TeV.periodAllYear_DetStatus-v79-repro20-02_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
-  #grllist.append('/afs/cern.ch/work/j/jodafons/public/data/data16_13TeV.periodAllYear_DetStatus-v81-pro20-10_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
-  #grllist.append('data16_13TeV.periodAllYear_DetStatus-v81-pro20-10_DQDefects-00-02-02_PHYS_StandardGRL_All_Good_25ns.xml')
-  grllist.append('data17_13TeV.periodAllYear_DetStatus-v92-pro21-05_Unknown_PHYS_StandardGRL_All_Good_25ns_Triggerno17e33prim.xml')
-
-####################################################################################################
-
-acf.EvtMax=nov
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger=True
-recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doMuonCombined=False
-rec.doWriteAOD=True
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False)      # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(True)       # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(False) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-MessageSvc.debugLimit = 20000000
-MessageSvc.infoLimit  = 20000000
-
-# Add Trigger Decision Tool 
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-tdt = Trig__TrigDecisionTool( "TrigDecisionTool" )
-tdt.TrigDecisionKey='xTrigDecision'
-tdt.Navigation.ReadonlyHolders=True
-ToolSvc+=tdt
-
-try:
-  include ("AthenaMonitoring/DataQualityInit_jobOptions.py")
-except Exception:
-  treatException("Could not load AthenaMonitoring/DataQualityInit_jobOptions.py")
-
-
-
-
-# Call top sequence
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-topSequence = AlgSequence()
-
-
-##################################### GRL Tools ##########################################
-# Good Run List (GRL)
-if doGRL:
-    from PyUtils.MetaReaderPeeker import metadata
-    try:
-        if metadata['eventTypes'][0] == 'IS_DATA':
-            from GoodRunsLists.GoodRunsListsConf import *
-            ToolSvc += GoodRunsListSelectorTool()
-            GoodRunsListSelectorTool.GoodRunsListVec = grllist
-            from GoodRunsListsUser.GoodRunsListsUserConf import *
-            seq = AthSequencer("AthFilterSeq")
-            seq += GRLTriggerSelectorAlg('GRLTriggerAlg1')
-            #seq.GRLTriggerAlg1.GoodRunsListArray = ['PHYS_StandardGRL_All_Good_25ns']
-            seq.GRLTriggerAlg1.GoodRunsListArray = [grllist[0].replace('.xml','')]
-    except:
-        print("GRL not available!")
-  
-##################################### Mon Tools ##########################################
-
-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 = "HLT");
-ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
-
-####################################################################################################
-#Define the base path for all histograms
-
-
-
-basePath = '/HLT/Egamma'
-#Configure the TrigEgammaPlotTool
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavTPAnalysisTool, TrigEgammaPlotTool, EfficiencyTool, DistTool, ResolutionTool
-from TrigEgammaAnalysisTools.TrigEgammaProbelist           import monitoring_mam, monitoring_electron, monitoring_photon 
-from TrigEgammaAnalysisTools.TrigEgammaProbelist           import probeListLowMidPtSupportingTriggers, probeListHighPtSupportingTriggers
-
-PlotTool = TrigEgammaPlotTool.copy( name="TrigEgammaPlotTool",
-                                    DirectoryPath=basePath,
-                                    MaM=monitoring_mam,
-                                    Efficiency=[],
-                                    Distribution=[],
-                                    Resolution=[])
-
-EffTool = EfficiencyTool.copy(name="EfficiencyTool",
-                              PlotTool=PlotTool,
-                              isEMResultNames=["Tight","Medium","Loose"],
-                              LHResultNames=["LHTight","LHMedium","LHLoose"],
-                              OutputLevel=0)
-
-
-
-####################################################################################################
-from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationTool
-from TrigEgammaEmulationTool.TrigEgammaEmulationEFConfig   import EgammaEFElectronDefaultEmulator,EgammaEFElectronNoD0Emulator
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-# Force this emulation selector path
-TriggerFlags.EgammaSlice.pidVersion.set_Value_and_Lock("ElectronPhotonSelectorTools/trigger/rel21_20170217/")
-TriggerFlags.EgammaSlice.ringerVersion.set_Value_and_Lock("RingerSelectorTools/TrigL2_20170505_v6")
-
-EmulationElectronTool = TrigEgammaEmulationTool.copy( name="TrigEgammaEmulationTool",
-                                                      TriggerList = triggerList,
-                                                      DoL2ElectronFex=True,
-                                                      DoEFCaloPid=False,
-                                                      DoRinger=True,
-                                                      OutputLevel=0)
-
-####################################################################################################
-
-AnalysisTool = TrigEgammaNavTPAnalysisTool( name = "TrigEgammaNavTPAnalysisTool",
-                                            Analysis='Zee',
-                                            PlotTool=PlotTool,
-                                            Tools=[EffTool],
-                                            OfflineTagSelector='Tight', # 1=tight, 2=medium, 3=loose
-                                            OfflineProbeSelector='Loose', 
-                                            DefaultProbePid='LHMedium',
-                                            doEmulation=doEmulation,
-                                            DetailedHistograms=DetailedHistograms,
-                                            EmulationTool=EmulationElectronTool,
-                                            TPTrigger=False,
-                                            RemoveCrack=False,
-                                            TagTriggerList=tagList,
-                                            TriggerList=triggerList,
-                                            OutputLevel=0)
-
-####################################################################################################
-Tools=['TrigEgammaNavTPAnalysisTool/TrigEgammaNavTPAnalysisTool']
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
-TrigEgammaMonTool = TrigEgammaMonTool( name = "HLTEgammaMon", histoPathBase=basePath, Tools=Tools)
-ToolSvc += TrigEgammaMonTool
-HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool/HLTEgammaMon" ]
-HLTMonManager.FileKey = "GLOBAL"
-ToolSvc.TrigDecisionTool.Navigation.OutputLevel = WARNING
-####################################################################################################
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaEventSelectionTool.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaEventSelectionTool.py
deleted file mode 100644
index ba72df178c83f6d1e99bf66c96169841bb2868a5..0000000000000000000000000000000000000000
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaEventSelectionTool.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-# Job options for standalone and Tier0 running of AnalysisTools 
-# Authors: 
-# Ryan Mackenzie White <ryan.white@cern.ch>
-# 
-# Tool and algorithm configuration done using egamma Factories
-# Default configurations found in TrigEgammaAnalysisToolsConfig
-#
-# To run
-# athena -l DEBUG -c "DIR='/afs/cern.ch/work/j/jolopezl/datasets/valid1.147406.PowhegPythia8_AZNLO_Zee.recon.AOD.e3099_s2578_r6220_tid05203475_00'" 
-#                 -c "NOV=50" test_ZeeElectronLowPtSupportingTrigAnalysis.py
-# where NOV is the number of events to run
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-from RecExConfig.RecFlags import rec
-from RecExConfig.RecAlgsFlags import recAlgs
-from AthenaCommon.AppMgr import ToolSvc
-import os
-
-doZ=True
-doFakes=True
-
-# Define triggers for tagging 
-triggerTags     = ['HLT_e24_lhtight_nod0_ivarloose',
-                   'HLT_e26_lhtight_nod0_ivarloose',
-                   'HLT_e28_lhtight_nod0_ivarloose']
-
-triggerList = [
-         # standard monitoring chains
-         'HLT_e26_lhtight_nod0_ivarloose',
-         'HLT_e28_lhtight_nod0_ivarloose',
-         'HLT_e60_lhmedium_nod0_L1EM24VHI',
-         # no ringer chains for pos-commissioning...
-         'HLT_e26_lhtight_nod0_noringer_ivarloose_L1EM22VHI',
-         'HLT_e28_lhtight_nod0_noringer_ivarloose', # get real TDT
-         'HLT_e28_lhtight_nod0_noringer_ivarloose_L1EM24VHI',
-         'HLT_e60_lhmedium_nod0_noringer_L1EM24VHI',
-      ]
-
-
-
-#print 'Set some variables for job'
-dirtouse = str()
-finallist=[]
-
-if 'FILE' in dir() :
-     finallist.append(FILE)
-
-if 'DIR' in dir() :
-     dirtouse=DIR      
-     print 'DIR = ',dirtouse
-     while( dirtouse.endswith('/') ) :
-          dirtouse= dirtouse.rstrip('/')
-     listfiles=os.listdir(dirtouse)
-     for ll in listfiles:
-          finallist.append(dirtouse+'/'+ll)
-
-if 'NOV' in dir():
-    nov=NOV
-else :
-    nov=-1
-
-
-print  finallist 
-athenaCommonFlags.FilesInput=finallist
-athenaCommonFlags.EvtMax=nov
-rec.readAOD=True
-# switch off detectors
-rec.doForwardDet=False
-rec.doInDet=False
-rec.doCalo=False
-rec.doMuon=False
-rec.doEgamma=False
-rec.doTrigger = True; recAlgs.doTrigger=False # disable trigger (maybe necessary if detectors switched off)
-rec.doMuon=False
-rec.doAOD=False
-rec.doMuonCombined=False
-rec.doWriteAOD=False
-rec.doWriteESD=False
-rec.doDPD=False
-rec.doTruth=False
-
-# autoconfiguration might trigger undesired feature
-rec.doESD.set_Value_and_Lock(False) # uncomment if do not run ESD making algorithms
-rec.doWriteESD.set_Value_and_Lock(False) # uncomment if do not write ESD
-rec.doAOD.set_Value_and_Lock(True) # uncomment if do not run AOD making algorithms
-rec.doWriteAOD.set_Value_and_Lock(False) # uncomment if do not write AOD
-rec.doWriteTAG.set_Value_and_Lock(False) # uncomment if do not write TAG
-
-# main jobOption
-include ("RecExCommon/RecExCommon_topOptions.py")
-MessageSvc.debugLimit = 20000000
-MessageSvc.infoLimit  = 20000000
-# TDT
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-tdt = Trig__TrigDecisionTool( "TrigDecisionTool" )
-tdt.TrigDecisionKey='xTrigDecision'
-tdt.Navigation.ReadonlyHolders=True
-ToolSvc+=tdt
-
-try:
-  include ("AthenaMonitoring/DataQualityInit_jobOptions.py")
-except Exception:
-  treatException("Could not load AthenaMonitoring/DataQualityInit_jobOptions.py")
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-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 = "HLT");
-
-ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
-    
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaPlotTool, getEventSelectionTool
-#Define the base path for all histograms
-basePath = '/HLT/Physval'
-
-#Configure the TrigEgammaPlotTool
-PlotTool = TrigEgammaPlotTool.copy( name="TrigEgammaPlotTool",
-                                    DirectoryPath=basePath,
-                                    #MaM=monitoring_mam,
-                                    Efficiency=[],
-                                    Distribution=[],
-                                    Resolution=[])
-
-TrigEgammaEventSelection = getEventSelectionTool()
-
-####################################################################################################
-
-from TrigEgammaEmulationTool.TrigEgammaEmulationToolConfig import TrigEgammaEmulationTool
-from TrigEgammaEmulationTool.TrigEgammaEmulationEFConfig   import EgammaEFElectronDefaultEmulator,EgammaEFElectronNoD0Emulator
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-
-# Force this emulation selector path
-TriggerFlags.EgammaSlice.pidVersion.set_Value_and_Lock("ElectronPhotonSelectorTools/trigger/rel21_20170217/")
-TriggerFlags.EgammaSlice.ringerVersion.set_Value_and_Lock("RingerSelectorTools/TrigL2_20170505_v6")
-
-EmulationElectronTool = TrigEgammaEmulationTool.copy( name="TrigEgammaEmulationTool",
-                                                      TriggerList = triggerList,
-                                                      DoL2ElectronFex=True,
-                                                      DoEFCaloPid=False,
-                                                      DoRinger=True,
-                                                      OutputLevel=0)
-
-####################################################################################################
-
-
-Tool = TrigEgammaEventSelection( name='EventSelection',
-                              Analysis='Probes',
-                              PlotTool=PlotTool,
-                              EmulationTool=EmulationElectronTool,
-                              File="",
-                              OutputLevel=0,
-                              DetailedHistograms=False,
-                              isEMResultNames=["Tight","Medium","Loose"],
-                              LHResultNames=["LHTight","LHMedium","LHLoose"],
-                              ZeeLowerMass=80,
-                              ZeeUpperMass=100,
-                              OfflineTagSelector='Tight', # 1=tight, 2=medium, 3=loose
-                              OfflineProbeSelector='Loose', 
-                              ForceProbePid=False, 
-                              OppositeCharge=True,
-                              OfflineTagMinEt=25,
-                              TagTriggerList=triggerTags,
-                              SelectionZ=doZ,
-                              SelectionFakes=doFakes,
-                              ApplyMinimalTrigger=False,
-                              DetailedDataLevel=2,
-                              DumpTags=False,
-                              TriggerList=triggerList)
-
-Tools=['TrigEgammaEventSelection/EventSelection']
-
-from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
-TrigEgammaMonTool = TrigEgammaMonTool( name = "HLTEgammaMon", 
-                                       histoPathBase=basePath,
-                                       Tools=Tools)
-
-ToolSvc += TrigEgammaMonTool
-
-#TrigEgammaMonToolConfig.TrigEgammaMonTool()
-HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool/HLTEgammaMon" ]
-HLTMonManager.FileKey = "GLOBAL"
-
-
-