From 51cf33ad11bdf68f84dfa245523b3ae2e226ceb0 Mon Sep 17 00:00:00 2001
From: Zara Grout <zara.jane.grout@cern.ch>
Date: Thu, 13 Dec 2018 19:11:16 +0100
Subject: [PATCH] Update packages:TrigFastTrackFinder TrigL2SiTrackFinder
 TrigL2TRTSegFinder TrigT2BeamSpot TrigTRTHighTHitCounter TrigInDetAnalysis
 TrigInDetAnalysisExample TrigInDetAnalysisUser TrigInDetAnalysisUtils
 TrigInDetTruthAlgs TrigInDetEvent TrigInDetEventTPCnv TrigInDetPattRecoEvent
 TrigIDJpsiMonitoring TrigIDTPMonitor TrigIDtrkMonitoring IDScanHitFilter
 IDScanZFinder TrigIDUtils TrigInDetPattRecoTools TrigInDetRecoTools
 TrigInDetToolInterfaces TrigInDetTrackExtrapolator TrigInDetTrackFitter
 TrigInDetVxInJetTool TrigJPsiTools TrigOfflineDriftCircleTool
 TrigOnlineSpacePointTool TrigSiSpacePointTool TrigTRT_TrackExtensionTool
 TrigVertexFitter TrigVKalFitter TrigInDetTruthEvent TrigTruthEventAthenaPool
 TrigTruthEventTPCnv TrigInDetValidation TrigInDetValidationLight
 TrigInDetValidationWeb  from upstream/21.0-TrigMC to upstream/master via
 pseudo-merge

Former-commit-id: 9e323acceac9252466231eabfb3add1044dbb01d
---
 .../python/TrigFastTrackFinder_Config.py      |  82 ++-
 .../src/TrigFastTrackFinder.cxx               | 140 +++++-
 .../src/TrigFastTrackFinder.h                 |  20 +-
 .../TrigFastTrackFinder_entries.cxx           |   1 +
 .../TrigInDetAnalysis/Efficiency.h            |   4 +-
 .../TrigInDetAnalysis/Filter_AcceptAll.h      |   4 +-
 .../TrigInDetAnalysis/TFileString.h           |   4 +-
 .../TrigInDetAnalysis/TIDAAssociator.h        |   4 +-
 .../TrigInDetAnalysis/TIDAChain.h             |   4 +-
 .../TrigInDetAnalysis/TIDAEvent.h             |   4 +-
 .../TrigInDetAnalysis/TIDAFeature.h           |   4 +-
 .../TrigInDetAnalysis/TIDAFeatureStore.h      |   4 +-
 .../TrigInDetAnalysis/TIDARoi.h               |   5 +-
 .../TrigInDetAnalysis/TIDARoiDescriptor.h     |   4 +-
 .../TrigInDetAnalysis/TIDARoiParameters.h     |   4 +-
 .../TrigInDetAnalysis/TIDAVertex.h            |   4 +-
 .../TrigInDetAnalysis/TIDDirectory.h          |   3 +
 .../TrigInDetAnalysis/Track.h                 |   3 +
 .../TrigInDetAnalysis/TrackAnalysis.h         |   5 +-
 .../TrigInDetAnalysis/TrackAnalysisSequence.h |   4 +-
 .../TrigInDetAnalysis/TrackAssociator.h       |   4 +-
 .../TrigInDetAnalysis/TrackFilter.h           |   4 +-
 .../TrigInDetAnalysis/TrackSelector.h         |   3 +
 .../TrigInDetAnalysis/TrackTrigObject.h       |   9 +-
 .../TrigInDetAnalysisLinkDef.h                |   4 +
 .../TrigInDetAnalysis/VertexAnalysis.h        |   4 +-
 .../TrigInDetAnalysis/src/TFileString.cxx     |   4 +-
 .../TrigInDetAnalysis/src/TIDAChain.cxx       |   4 +-
 .../TrigInDetAnalysis/src/TIDAEvent.cxx       |   4 +-
 .../TrigInDetAnalysis/src/TIDARoi.cxx         |   4 +-
 .../src/TIDARoiDescriptor.cxx                 |   4 +-
 .../src/TIDARoiParameters.cxx                 |   4 +-
 .../TrigInDetAnalysis/src/TIDAVertex.cxx      |   4 +-
 .../TrigInDetAnalysis/src/Track.cxx           |   3 +
 .../TrigInDetAnalysis/src/TrackTrigObject.cxx |   4 +-
 .../AnalysisConfig_Ntuple.h                   |   3 +
 .../AnalysisConfig_Tier0.h                    |   3 +
 .../Analysis_Distribution.h                   |   3 +
 .../Analysis_Efficiency.h                     |   3 +
 .../TrigInDetAnalysisExample/Analysis_Fake.h  |   3 +
 .../Analysis_Missed.h                         |   3 +
 .../Analysis_Resolution.h                     |   3 +
 .../Analysis_ResolutionCosmics.h              |   3 +
 .../TrigInDetAnalysisExample/Analysis_Tier0.h |   4 +-
 .../TrigInDetAnalysisExample/ChainString.h    |   4 +-
 .../NtupleTrackSelector.h                     |   3 +
 .../TrigInDetAnalysisExample/SigAnalysis.h    |   4 +-
 .../T_AnalysisConfig_Tier0.h                  |   5 +-
 .../TrackDistributions.h                      |   4 +-
 .../TrackEfficiency.h                         |   4 +-
 .../TrigInDetAnalysisExample/TrigTestBase.h   |   3 +
 .../TrigTestMonToolAC.h                       |   3 +
 .../TrigTestPhysValMon.h                      |   3 +
 .../TrigInDetAnalysisExample/VtxAnalysis.h    |   4 +-
 .../src/AnalysisConfig_Ntuple.cxx             |  27 +-
 .../src/Analysis_Distribution.cxx             |   3 +
 .../src/Analysis_Efficiency.cxx               |   3 +
 .../src/Analysis_Fake.cxx                     |   3 +
 .../src/Analysis_Missed.cxx                   |   3 +
 .../src/Analysis_Resolution.cxx               |   3 +
 .../src/Analysis_ResolutionCosmics.cxx        |   3 +
 .../src/Analysis_Tier0.cxx                    |   3 +-
 .../src/ChainString.cxx                       |   4 +-
 .../src/SigAnalysis.cxx                       |   4 +-
 .../src/TrackDistributions.cxx                |   4 +-
 .../src/TrackEfficiency.cxx                   |   4 +-
 .../src/TrigTestBase.cxx                      |   3 +
 .../src/TrigTestMonToolAC.cxx                 |   4 +-
 .../src/TrigTestPhysValMon.cxx                |   4 +-
 .../src/VtxAnalysis.cxx                       |   4 +-
 .../Analysis/src/AtlasLabels.cxx              |   3 +
 .../Analysis/src/AtlasLabels.h                |   4 +-
 .../Analysis/src/AtlasStyle.cxx               |   3 +
 .../Analysis/src/AtlasStyle.h                 |   4 +-
 .../Analysis/src/AtlasUtils.h                 |   3 +
 .../Analysis/src/BinConfig.h                  |   4 +-
 .../Analysis/src/ConfAnalysis.cxx             |   4 +-
 .../Analysis/src/ConfAnalysis.h               |   4 +-
 .../Analysis/src/ConfVtxAnalysis.cxx          |   4 +-
 .../Analysis/src/ConfVtxAnalysis.h            |   4 +-
 .../Analysis/src/Contour.h                    |   4 +-
 .../Analysis/src/DrawLabel.h                  |   4 +-
 .../Analysis/src/PurityAnalysis.cxx           |   4 +-
 .../Analysis/src/PurityAnalysis.h             |   4 +-
 .../Analysis/src/RoiFilter.h                  |   4 +-
 .../Analysis/src/chainparser.cxx              |   4 +-
 .../Analysis/src/chains.cxx                   |   3 +
 .../Analysis/src/comparitor.cxx               |   4 +-
 .../Analysis/src/computils.cxx                |   4 +-
 .../Analysis/src/computils.h                  |   4 +-
 .../Analysis/src/cpucost.cxx                  |   4 +-
 .../Analysis/src/dataset.h                    |   4 +-
 .../Analysis/src/default_panels.h             |   3 +
 .../Analysis/src/effic2.h                     |   3 +
 .../Analysis/src/event_selector.h             |   4 +-
 .../Analysis/src/fastadd.cxx                  |   4 +-
 .../Analysis/src/globals.cxx                  |   4 +-
 .../Analysis/src/globals.h                    |   4 +-
 .../Analysis/src/grl_run.h                    |   4 +-
 .../Analysis/src/label.h                      |   4 +-
 .../Analysis/src/listroot.cxx                 |   3 +
 .../Analysis/src/lumiList.h                   |   4 +-
 .../Analysis/src/lumiParser.h                 |   4 +-
 .../Analysis/src/makeSmallRefFile.cxx         |   3 +
 .../Analysis/src/reader.cxx                   |   4 +-
 .../Analysis/src/refit.cxx                    |   4 +-
 .../Analysis/src/rmain.cxx                    |   3 +
 .../Analysis/src/runtool.cxx                  |   4 +-
 .../Analysis/src/simpletimer.h                |   4 +-
 .../Analysis/src/skim.cxx                     |   4 +-
 .../Analysis/src/wmain.cxx                    |   3 +
 .../Analysis/src/zbeam.h                      |   4 +-
 .../Readcards/src/IReadCards.cxx              |   3 +
 .../Readcards/src/IReadCards.h                |   3 +
 .../Readcards/src/ReadCards.cxx               |   3 +
 .../Readcards/src/ReadCards.h                 |   3 +
 .../Readcards/src/Value.cxx                   |   3 +
 .../Readcards/src/Value.h                     |   3 +
 .../Readcards/src/main.cxx                    |   3 +
 .../Readcards/src/utils.cxx                   |   3 +
 .../Readcards/src/utils.h                     |   3 +
 .../Resplot/src/BasicRandom.h                 |   4 +-
 .../Resplot/src/Directory.h                   |   3 +
 .../Resplot/src/Random.h                      |   4 +-
 .../Resplot/src/Resplot.cxx                   |   3 +
 .../Resplot/src/Resplot.h                     |   3 +
 .../Resplot/src/StatVal.h                     |   3 +
 .../Resplot/src/generate.cxx                  |   3 +
 .../Resplot/src/generate.h                    |   3 +
 .../Resplot/src/main.cxx                      |   3 +
 .../Resplot/src/rmsFrac.cxx                   |   3 +
 .../Resplot/src/rmsFrac.h                     |   3 +
 .../Resplot/src/tagname.h                     |   3 +
 .../share/TIDAparseGRL.py                     |   1 -
 .../Associator_BestMatch.h                    |   4 +-
 .../Associator_DeltaEtaPhi.h                  |   3 +
 .../Associator_DeltaR.h                       |   3 +
 .../Associator_DeltaRCosmics.h                |   3 +
 .../Associator_TruthMatch.h                   |   3 +
 .../TrigInDetAnalysisUtils/BestMatcher.h      |   4 +-
 .../Filter_Offline2017.h                      |  20 +-
 .../Filter_RoIMatching.h                      |   3 +
 .../Filter_RoiSelector.h                      |   4 +-
 .../TrigInDetAnalysisUtils/Filter_Track.h     |   4 +-
 .../TrigInDetAnalysisUtils/Filter_TrackHits.h |   3 +
 .../Filter_TrackParameters.h                  |   3 +
 .../Filter_TrackQuality.h                     |   3 +
 .../TrigInDetAnalysisUtils/Filter_etaPT.h     |   4 +-
 .../TrigInDetAnalysisUtils/Filters.h          |   4 +-
 .../OfflineObjectSelection.h                  |   3 +
 .../TIDARoiDescriptorBuilder.h                |   4 +-
 .../TrigInDetAnalysisUtils/T_AnalysisConfig.h |  45 +-
 .../TrigInDetAnalysisUtils/TrackMatchDeltaR.h |   4 +-
 .../TrackMatchDeltaRCosmic.h                  |   4 +-
 .../TrigTrackSelector.h                       |  18 +-
 .../TrigInDetAnalysisUtils/VertexAssociator.h |   3 +
 .../TrigInDetAnalysisUtils/VertexMatcher.h    |   4 +-
 .../TrigInDetAnalysisUtils/particleType.h     |   4 +-
 .../src/OfflineObjectSelection.cxx            |   3 +
 .../src/TrigTrackSelector.cxx                 |  90 ++--
 .../TrigInDetEvent/TrigVertex.h               |   2 +-
 .../AnalysisConfig_Jpsi.h                     |   2 +-
 .../TrigIDJpsiMonitoring/JpsiAnalysis.h       |   4 +-
 .../TrigIDJpsiMonitoring/JpsiEfficiency.h     |   4 +-
 .../src/AnalysisConfig_Jpsi.cxx               |  12 +-
 .../src/TrigJpsiMonTool.cxx                   |   4 +-
 .../python/TrigIDTPMonitorMonitoring.py       |  22 +-
 .../TrigIDTPMonitor/src/TrigIDTPMonitor.cxx   |   4 +-
 .../src/TrigIDTPMonitorElectron.cxx           |   6 +-
 .../src/TrigIDTPMonitorElectron.h             |   2 +-
 .../components/TrigIDTPMonitor_entries.cxx    |   2 +-
 .../python/TrigIDtrkMonitoringConfig.py       | 469 +++++++++++-------
 .../TrigIDtrkMonitoring/utils/hanconfig.cxx   |   4 +-
 .../TrigIDtrkMonitoring/utils/simpletimer.h   |   4 +-
 .../IDScanHitFilter/src/FilterBin.cxx         |   4 +-
 .../IDScanZFinder/TrigZFinderInternal.h       |   6 +
 .../IDScanZFinder/src/IDScanZFinder.cxx       |  17 +-
 .../IDScanZFinder/src/TrigZFinder.cxx         |  30 +-
 .../IDScanZFinder/src/TrigZFinderInternal.cxx | 118 +++--
 .../TrigOnlineSpacePointTool/CMakeLists.txt   |   1 +
 .../src/TrigSpacePointConversionTool.cxx      |   3 +
 .../TrigInDetValidation/TIDAbuild/makefile    |   1 -
 .../share/TrigInDetValidation_RTT_Chains.py   |   9 +-
 ...nDetValidation_RTT_topOptions_AllSlices.py |   2 +-
 ...Validation_RTT_topOptions_BeamspotSlice.py |  13 +-
 ...nDetValidation_RTT_topOptions_BjetSlice.py |   2 +-
 ...Validation_RTT_topOptions_ElectronSlice.py |   2 +-
 ...tValidation_RTT_topOptions_MonitorSlice.py |   2 +-
 ...nDetValidation_RTT_topOptions_MuonSlice.py |   2 +-
 ...InDetValidation_RTT_topOptions_TauSlice.py |   2 +-
 ...gindetvalidation_tau_ibl_pu46_nodoublet.sh |   7 +-
 ...igindetvalidation_tau_ibl_pu46_roiparam.sh |   7 +-
 .../TrigInDetValidation/utils/mkargs          |  11 +-
 .../utils/selectblock/selectblock.cxx         |  10 +-
 .../TIDAbuild/makefile                        |   2 +-
 195 files changed, 1271 insertions(+), 509 deletions(-)

diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 34d6f744fb9..f9595911bf2 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from TrigFastTrackFinder.TrigFastTrackFinderConf import TrigFastTrackFinder
 
@@ -139,23 +139,23 @@ class TrigFastTrackFinder_CommonMonitoring(TrigGenericMonitoringToolConfig):
                                              title="Pure PattReco time",
                                              xbins = nbin , xmin=0.0, xmax=200.0)]
     def addResidualHistograms(self):
-        self.Histograms += [ defineHistogram('IBL_Layer',
+        self.Histograms += [ defineHistogram('layer_IBL',
                                              type='TH1F',
                                              title="IBL layer",
                                              xbins = 10, xmin=0., xmax=10.)]
-        self.Histograms += [ defineHistogram('PixB_Layer',
+        self.Histograms += [ defineHistogram('layer_PixB',
                                              type='TH1F',
                                              title="Pixel Barrel layer",
                                              xbins = 10, xmin=0., xmax=10.)]
-        self.Histograms += [ defineHistogram('PixEC_Layer',
+        self.Histograms += [ defineHistogram('layer_PixE',
                                              type='TH1F',
                                              title="Pixel Endcap layer",
                                              xbins = 10, xmin=0., xmax=10.)]
-        self.Histograms += [ defineHistogram('SCTB_Layer',
+        self.Histograms += [ defineHistogram('layer_SCTB',
                                              type='TH1F',
                                              title="SCT Barrel layer",
                                              xbins = 10, xmin=0., xmax=10.)]
-        self.Histograms += [ defineHistogram('SCTEC_Layer',
+        self.Histograms += [ defineHistogram('layer_SCTE',
                                              type='TH1F',
                                              title="SCT Endcap layer",
                                              xbins = 10, xmin=0., xmax=10.)]
@@ -219,6 +219,22 @@ class TrigFastTrackFinder_CommonMonitoring(TrigGenericMonitoringToolConfig):
                                              type='TH1F',
                                              title="SCT Barrel hit-track residual",
                                              xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTBarrelL1PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Barrel L1 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTBarrelL2PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Barrel L2 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTBarrelL3PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Barrel L3 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTBarrelL4PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Barrel L4 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
         self.Histograms += [ defineHistogram('hit_SCTBarrelPull',
                                              type='TH1F',
                                              title="SCT Barrel hit-track pull",
@@ -267,6 +283,42 @@ class TrigFastTrackFinder_CommonMonitoring(TrigGenericMonitoringToolConfig):
                                              type='TH1F',
                                              title="SCT EC hit-track residual",
                                              xbins = 100, xmin=-1.0, xmax=1.0)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL1PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L1 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL2PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L2 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL3PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L3 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL4PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L4 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL5PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L5 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL6PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L6 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL7PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L7 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL8PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L8 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
+        self.Histograms += [ defineHistogram('hit_SCTEndcapL9PhiResidual',
+                                             type='TH1F',
+                                             title="SCT Endcap L9 hit-track phi residual",
+                                             xbins = 100, xmin=-0.5, xmax=0.5)]
         self.Histograms += [ defineHistogram('hit_SCTEndCapPull',
                                              type='TH1F',
                                              title="SCT EC hit-track pull",
@@ -408,7 +460,6 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
                                 TrigFastTrackFinder_OnlineMonitoring("TrigFastTrackFinder_OnlineMonitoring", self.doResMon),
                                 timeHist ]
 
-
         from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool
         self.TrackSummaryTool = InDetTrigFastTrackSummaryTool
 
@@ -445,12 +496,15 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
           self.doSeedRedundancyCheck = InDetTrigSliceSettings[('checkRedundantSeeds',remapped_type)]
           self.Triplet_D0Max        = InDetTrigSliceSettings[('d0SeedMax',remapped_type)]
           self.Triplet_D0_PPS_Max   = InDetTrigSliceSettings[('d0SeedPPSMax',remapped_type)] 
-          self.TrackInitialD0Max   = InDetTrigSliceSettings[('d0TrackInitialMax',remapped_type)] 
+          self.TrackInitialD0Max = 20.
+          if remapped_type=='cosmics':
+            self.TrackInitialD0Max = 1000.
+            self.TrackZ0Max   = 1000.
+
           self.TripletDoPSS   = False
           self.pTmin = InDetTrigSliceSettings[('pTmin',remapped_type)]
           self.DoubletDR_Max = InDetTrigSliceSettings[('dRdoubletMax',remapped_type)]
           self.SeedRadBinWidth = InDetTrigSliceSettings[('seedRadBinWidth',remapped_type)]
-          self.doTrigInDetTrack = InDetTrigSliceSettings[('doTrigInDetTrack',remapped_type)]
 
           if remapped_type=="cosmics":
             self.Doublet_FilterRZ = False
@@ -535,11 +589,15 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
             ToolSvc += theTrigZFinder
             self.trigZFinder = theTrigZFinder
             self.doFastZVertexSeeding = True
-            self.zVertexResolution = 7.5
+            self.zVertexResolution = 1
 
           TrackMaker_FTF.InputClusterContainerName = ""
           TrackMaker_FTF.InputHadClusterContainerName = ""
           
+          
+          from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigFastTrackSummaryTool
+          self.TrackSummaryTool = InDetTrigFastTrackSummaryTool
+
           if remapped_type == "tauCore":
             from TrigInDetConf.TrigInDetRecCommonTools import InDetTrigTrackSummaryToolWithHoleSearch
             self.TrackSummaryTool = InDetTrigTrackSummaryToolWithHoleSearch
@@ -578,3 +636,7 @@ class TrigFastTrackFinder_FTK(TrigFastTrackFinderBase):
 class TrigFastTrackFinder_FTKRefit(TrigFastTrackFinderBase):
   def __init__(self, name = "TrigFastTrackFinder_FTKRefit"):
     TrigFastTrackFinderBase.__init__(self, "TrigFastTrackFinder_FTKRefit","FTKRefit")
+
+class TrigFastTrackFinder_FTKMon(TrigFastTrackFinderBase):
+  def __init__(self, name = "TrigFastTrackFinder_FTKMon"):
+    TrigFastTrackFinderBase.__init__(self, "TrigFastTrackFinder_FTKMon","FTKMon")
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index d78aca08cd0..9420fb63a10 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -14,10 +14,8 @@
 #include <cmath>
 #include <iostream>
 #include <algorithm>
-#include <array>
 #include <memory>
 
-#include <tbb/parallel_for.h>
 #include "TrigSteeringEvent/TrigRoiDescriptor.h"
 #include "TrigSteeringEvent/PhiHelper.h"
 
@@ -25,9 +23,6 @@
 
 #include "TrigInDetEvent/TrigVertex.h"
 #include "TrigInDetEvent/TrigVertexCollection.h"
-#include "TrigInDetEvent/TrigInDetTrack.h"
-#include "TrigInDetEvent/TrigInDetTrackCollection.h"
-#include "TrigInDetEvent/TrigInDetTrackFitPar.h"
 
 #include "TrkTrack/TrackCollection.h"
 #include "TrkTrack/Track.h"
@@ -144,6 +139,7 @@ TrigFastTrackFinder::TrigFastTrackFinder(const std::string& name, ISvcLocator* p
   declareProperty("Triplet_MinPtFrac",        m_tripletMinPtFrac = 0.3);
   declareProperty("pTmin",                    m_pTmin = 1000.0);
   declareProperty("TrackInitialD0Max",            m_initialD0Max      = 10.0);
+  declareProperty("TrackZ0Max",                   m_Z0Max      = 300.0);
 
   declareProperty("doSeedRedundancyCheck",            m_checkSeedRedundancy = false);
 
@@ -221,6 +217,12 @@ TrigFastTrackFinder::TrigFastTrackFinder(const std::string& name, ISvcLocator* p
   //declareMonitoredStdContainer("sp_r" ,m_sp_r);
 
   //Unbiased residuals
+  declareMonitoredStdContainer("layer_IBL",m_IBL_layer);
+  declareMonitoredStdContainer("layer_PixB",m_PixB_layer);
+  declareMonitoredStdContainer("layer_PixE",m_PixE_layer);
+  declareMonitoredStdContainer("layer_SCTB",m_SCTB_layer);
+  declareMonitoredStdContainer("layer_SCTE",m_SCTE_layer);
+
   declareMonitoredStdContainer("hit_IBLPhiResidual",m_iblResPhi);
   declareMonitoredStdContainer("hit_IBLEtaResidual",m_iblResEta);
   declareMonitoredStdContainer("hit_IBLPhiPull",    m_iblPullPhi);
@@ -252,6 +254,20 @@ TrigFastTrackFinder::TrigFastTrackFinder(const std::string& name, ISvcLocator* p
   declareMonitoredStdContainer("hit_PIXEndCapL3PhiResidual",m_pixResPhiECL3);
   declareMonitoredStdContainer("hit_PIXEndCapL3EtaResidual",m_pixResEtaECL3);
 
+  declareMonitoredStdContainer("hit_SCTBarrelL1PhiResidual",m_sctResPhiBarrelL1);
+  declareMonitoredStdContainer("hit_SCTBarrelL2PhiResidual",m_sctResPhiBarrelL2);
+  declareMonitoredStdContainer("hit_SCTBarrelL3PhiResidual",m_sctResPhiBarrelL3);
+  declareMonitoredStdContainer("hit_SCTBarrelL4PhiResidual",m_sctResPhiBarrelL4);
+
+  declareMonitoredStdContainer("hit_SCTEndcapL1PhiResidual",m_sctResPhiEndcapL1);
+  declareMonitoredStdContainer("hit_SCTEndcapL2PhiResidual",m_sctResPhiEndcapL2);
+  declareMonitoredStdContainer("hit_SCTEndcapL3PhiResidual",m_sctResPhiEndcapL3);
+  declareMonitoredStdContainer("hit_SCTEndcapL4PhiResidual",m_sctResPhiEndcapL4);
+  declareMonitoredStdContainer("hit_SCTEndcapL5PhiResidual",m_sctResPhiEndcapL5);
+  declareMonitoredStdContainer("hit_SCTEndcapL6PhiResidual",m_sctResPhiEndcapL6);
+  declareMonitoredStdContainer("hit_SCTEndcapL7PhiResidual",m_sctResPhiEndcapL7);
+  declareMonitoredStdContainer("hit_SCTEndcapL8PhiResidual",m_sctResPhiEndcapL8);
+  declareMonitoredStdContainer("hit_SCTEndcapL9PhiResidual",m_sctResPhiEndcapL9);
 }
 
 //--------------------------------------------------------------------------
@@ -339,7 +355,8 @@ HLT::ErrorCode TrigFastTrackFinder::hltInitialize() {
         ATH_MSG_ERROR("Could not retrieve "<<m_trigZFinder); 
         return HLT::BAD_JOB_SETUP;
       }
-    } else {
+    }
+    else {
       m_trigZFinder.disable();
     }
 
@@ -352,6 +369,15 @@ HLT::ErrorCode TrigFastTrackFinder::hltInitialize() {
         ATH_MSG_INFO("Configured to retrieve FTK tracks from " << m_ftkDataProviderSvcName);
       }
     }
+    if(m_doFTKZFinder ) {
+      StatusCode sc= m_ftkDataProviderSvc.retrieve();
+      if(sc.isFailure()) {
+        ATH_MSG_ERROR("unable to locate FTK_DataProviderSvc" << m_ftkDataProviderSvcName);
+        return HLT::BAD_JOB_SETUP;
+      } else {
+        ATH_MSG_INFO("Configured to retrieve FTK tracks from " << m_ftkDataProviderSvcName);
+      }
+    }
   }
 
   StatusCode sc= m_trackSummaryTool.retrieve();
@@ -587,8 +613,8 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
       for (auto vertex : *vertexCollection) {
         if (m_zVertices.size() == MaxNumVertex) continue;
         ATH_MSG_DEBUG("REGTEST / FTK ZFinder vertex: x,y,z, nTrack  type"   << vertex->x()  << " " <<  vertex->y() << " "  << vertex->z() << "  " << vertex->vxTrackAtVertex().size() << "  " << vertex->vertexType() );
-        // test to compare with Tyler's numbers
-        if (vertex->vxTrackAtVertex().size() < 3 ) continue;
+	// test to compare with Tyler's numbers
+	if (vertex->vxTrackAtVertex().size() < 3 ) continue;
 
         float z      = vertex->z();
         float zMinus = z - 7.0;
@@ -599,14 +625,15 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
         superRoi->push_back(newRoi);
         m_zVertices.push_back(z);
         m_nTrk_zVtx.push_back( vertex->vxTrackAtVertex().size());
-        m_tcs.m_vZv.push_back(z);
+	m_tcs.m_vZv.push_back(z);
 
       } // end loop over vertices
       m_tcs.roiDescriptor = superRoi.get();
       ATH_MSG_DEBUG("REGTEST / superRoi: " << *superRoi);
       delete vertexCollection;
       if ( timerSvc() ) m_ZFinderTimer->stop();
-      } else {
+      } 
+      else {
         if ( timerSvc() ) m_ZFinderTimer->start();
         m_tcs.m_vZv.clear();
         superRoi->setComposite(true);
@@ -670,7 +697,6 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
 
     if (m_doZFinder && m_doFastZVseeding) seedGen.createSeedsZv();
     else seedGen.createSeeds();
-
     std::vector<TrigInDetTriplet*> triplets;
     seedGen.getSeeds(triplets);
 
@@ -738,9 +764,9 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
         if((*t)) {
           float d0 = (*t)->perigeeParameters()==0 ? 10000.0 : (*t)->perigeeParameters()->parameters()[Trk::d0]; 
           if (fabs(d0) > m_initialD0Max) {
-            ATH_MSG_DEBUG("REGTEST / Reject track with d0 = " << d0 << " > " << m_initialD0Max);
-            qualityTracks.push_back(std::make_tuple(false,0,(*t)));//Flag track as bad, but keep in vector for later deletion
-            continue;
+	     ATH_MSG_DEBUG("REGTEST / Reject track with d0 = " << d0 << " > " << m_initialD0Max);
+	     qualityTracks.push_back(std::make_tuple(false,0,(*t)));//Flag track as bad, but keep in vector for later deletion
+	     continue;
           }
           if(m_checkSeedRedundancy) {
             //update clusterMap 
@@ -827,11 +853,28 @@ StatusCode TrigFastTrackFinder::findTracks(const TrigRoiDescriptor& roi,
       ATH_MSG_DEBUG("REGTEST / No tracks fitted");
     }
 
-    for (auto fittedTrack = outputTracks.begin(); fittedTrack!=outputTracks.end(); ++fittedTrack) {
+    size_t counter(1);
+    for (auto fittedTrack = outputTracks.begin(); fittedTrack!=outputTracks.end(); ) {
+      if ((*fittedTrack)->perigeeParameters()){
+	float d0 = (*fittedTrack)->perigeeParameters()->parameters()[Trk::d0]; 
+	float z0 = (*fittedTrack)->perigeeParameters()->parameters()[Trk::z0]; 
+	if (fabs(d0) > m_initialD0Max || fabs(z0) > m_Z0Max) {
+	  ATH_MSG_WARNING("REGTEST / Reject track after fit with d0 = " << d0 << " z0= "  << z0
+			  << " larger than limits (" << m_initialD0Max << ", " << m_Z0Max << ")");
+	  ATH_MSG_DEBUG(**fittedTrack);
+	  fittedTrack = outputTracks.erase(fittedTrack);
+	  continue;
+	}
+
+      } 
+
       (*fittedTrack)->info().setPatternRecognitionInfo(Trk::TrackInfo::FastTrackFinderSeed);
-      ATH_MSG_VERBOSE("Updating fitted track: " << *fittedTrack);
+      ATH_MSG_VERBOSE("Updating fitted track: " << counter);
+      ATH_MSG_VERBOSE(**fittedTrack);
       m_trackSummaryTool->updateTrack(**fittedTrack);
-      ATH_MSG_VERBOSE("Updated track: " << **fittedTrack);
+      ATH_MSG_VERBOSE("Updated track: " << counter);
+      ATH_MSG_VERBOSE(**fittedTrack);
+      counter++; fittedTrack++;
     }
 
     if ( timerSvc() ) { 
@@ -1111,6 +1154,12 @@ void TrigFastTrackFinder::clearMembers() {
   //m_sp_z.clear();
   //m_sp_r.clear();
 
+  m_IBL_layer.clear();
+  m_PixB_layer.clear();
+  m_PixE_layer.clear();
+  m_SCTB_layer.clear();
+  m_SCTE_layer.clear();
+
   m_iblResPhi.clear();
   m_iblResEta.clear();
   m_iblPullPhi.clear();
@@ -1142,6 +1191,20 @@ void TrigFastTrackFinder::clearMembers() {
   m_pixResPhiECL3.clear();
   m_pixResEtaECL3.clear();
 
+  m_sctResPhiBarrelL1.clear();
+  m_sctResPhiBarrelL2.clear();
+  m_sctResPhiBarrelL3.clear();
+  m_sctResPhiBarrelL4.clear();
+
+  m_sctResPhiEndcapL1.clear();
+  m_sctResPhiEndcapL2.clear();
+  m_sctResPhiEndcapL3.clear();
+  m_sctResPhiEndcapL4.clear();
+  m_sctResPhiEndcapL5.clear();
+  m_sctResPhiEndcapL6.clear();
+  m_sctResPhiEndcapL7.clear();
+  m_sctResPhiEndcapL8.clear();
+  m_sctResPhiEndcapL9.clear();
 
   m_nPixSPsInRoI=0;
   m_nSCTSPsInRoI=0;
@@ -1310,7 +1373,7 @@ void TrigFastTrackFinder::runResidualMonitoring(const Trk::Track& track) {
         break;
       case Region::PixEndcap :
         ATH_MSG_DEBUG("Pixel Endcap "  );
-	m_PixEC_layer.push_back(pixlayer);
+	m_PixE_layer.push_back(pixlayer);
         m_pixResPhiEC.push_back(it->phiResidual());
         m_pixPullPhiEC.push_back(it->phiPull());
 	if (pixlayer == 0) {
@@ -1333,12 +1396,51 @@ void TrigFastTrackFinder::runResidualMonitoring(const Trk::Track& track) {
         ATH_MSG_DEBUG("SCT Barrel"  );
         m_sctResBarrel.push_back(it->phiResidual());
         m_sctPullBarrel.push_back(it->phiPull());
+	if (sctlayer == 0) {
+	  m_sctResPhiBarrelL1.push_back(it->phiResidual());
+	}
+	if (sctlayer == 1) {
+	  m_sctResPhiBarrelL2.push_back(it->phiResidual());
+	}
+	if (sctlayer == 2) {
+	  m_sctResPhiBarrelL3.push_back(it->phiResidual());
+	}
+	if (sctlayer == 3) {
+	  m_sctResPhiBarrelL4.push_back(it->phiResidual());
+	}
         break;
       case Region::SctEndcap :
-	m_SCTEC_layer.push_back(sctlayer);
+	m_SCTE_layer.push_back(sctlayer);
         ATH_MSG_DEBUG("SCT Endcap"  );
         m_sctResEC.push_back(it->phiResidual());
         m_sctPullEC.push_back(it->phiPull());
+	if (sctlayer == 0) {
+	  m_sctResPhiEndcapL1.push_back(it->phiResidual());
+	}
+	if (sctlayer == 1) {
+	  m_sctResPhiEndcapL2.push_back(it->phiResidual());
+	}
+	if (sctlayer == 2) {
+	  m_sctResPhiEndcapL3.push_back(it->phiResidual());
+	}
+	if (sctlayer == 3) {
+	  m_sctResPhiEndcapL4.push_back(it->phiResidual());
+	}
+	if (sctlayer == 4) {
+	  m_sctResPhiEndcapL5.push_back(it->phiResidual());
+	}
+	if (sctlayer == 5) {
+	  m_sctResPhiEndcapL6.push_back(it->phiResidual());
+	}
+	if (sctlayer == 6) {
+	  m_sctResPhiEndcapL7.push_back(it->phiResidual());
+	}
+	if (sctlayer == 7) {
+	  m_sctResPhiEndcapL8.push_back(it->phiResidual());
+	}
+	if (sctlayer == 8) {
+	  m_sctResPhiEndcapL9.push_back(it->phiResidual());
+	}
         break;
       case Region::IBL :
 	m_IBL_layer.push_back(pixlayer);
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
index 75e0611b5bd..b2cf1d2d22f 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
@@ -140,7 +140,7 @@ protected:
   float m_tripletMinPtFrac;
   float m_pTmin;
   float m_initialD0Max;
-
+  float m_Z0Max;                        
   bool m_checkSeedRedundancy;
 
   // Names of IDCs with input data 
@@ -187,9 +187,9 @@ protected:
   //
   std::vector<float> m_IBL_layer;
   std::vector<float> m_PixB_layer;
-  std::vector<float> m_PixEC_layer;
+  std::vector<float> m_PixE_layer;
   std::vector<float> m_SCTB_layer;
-  std::vector<float> m_SCTEC_layer;
+  std::vector<float> m_SCTE_layer;
 
   std::vector<double> m_iblResPhi;
   std::vector<double> m_iblResEta;
@@ -222,6 +222,20 @@ protected:
   std::vector<double> m_pixResPhiECL3;
   std::vector<double> m_pixResEtaECL3;
 
+  std::vector<double> m_sctResPhiBarrelL1;
+  std::vector<double> m_sctResPhiBarrelL2;
+  std::vector<double> m_sctResPhiBarrelL3;
+  std::vector<double> m_sctResPhiBarrelL4; 
+
+  std::vector<double> m_sctResPhiEndcapL1;
+  std::vector<double> m_sctResPhiEndcapL2;
+  std::vector<double> m_sctResPhiEndcapL3;
+  std::vector<double> m_sctResPhiEndcapL4;
+  std::vector<double> m_sctResPhiEndcapL5;
+  std::vector<double> m_sctResPhiEndcapL6;
+  std::vector<double> m_sctResPhiEndcapL7; 
+  std::vector<double> m_sctResPhiEndcapL8;
+  std::vector<double> m_sctResPhiEndcapL9;
   // Monitoring member functions 
 
   void fillMon(const TrackCollection& tracks, const TrigRoiDescriptor& roi);
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/components/TrigFastTrackFinder_entries.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/components/TrigFastTrackFinder_entries.cxx
index c8b19b8532e..23dba9e3cdc 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/components/TrigFastTrackFinder_entries.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/components/TrigFastTrackFinder_entries.cxx
@@ -3,3 +3,4 @@
 
 DECLARE_COMPONENT( TrigFastTrackFinder )
 
+
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Efficiency.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Efficiency.h
index 575a1afb63c..e2c48a07eee 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Efficiency.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Efficiency.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Efficiency.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Efficiency.h, v0.0   Mon 26 Oct 2009 01:22:40 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Filter_AcceptAll.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Filter_AcceptAll.h
index 18c5dd8866d..4e7edcd3338 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Filter_AcceptAll.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Filter_AcceptAll.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Filter_AcceptAll.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Filter_AcceptAll.h, v0.0   Wed 28 Oct 2009 02:44:40 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TFileString.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TFileString.h
index b7f7269a86f..f0ba2e081f0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TFileString.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TFileString.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   TFileString.h        
 //
 //    root TObject std::string std::vector class for writing std::string std::vectors
 //    to root files               
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TFileString.h, v0.0   Sat Mar 15 19:49:16 GMT 2008 sutt
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAAssociator.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAAssociator.h
index bc4235230c2..368e76bf66f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAAssociator.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAAssociator.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDAAssociator.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TIDAAssociator.h, v0.0   Sun 18 Jan 2009 19:08:11 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAChain.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAChain.h
index 62c82b479ce..a508bdc56bf 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAChain.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAChain.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDAChain.h        
 //
 //            chain container, contains rois       
 //   
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDAChain.h, v0.0   Mon  1 Feb 2010 11:43:51 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAEvent.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAEvent.h
index 78ade983d97..1e59ed7a037 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAEvent.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAEvent.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDAEvent.h        
 //
 //            Basic event class to contain a vector of
 //            chains for trigger analysis                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDAEvent.h, v0.0   Mon  1 Feb 2010 11:43:51 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeature.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeature.h
index 5ba457698f6..651a8b632b5 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeature.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeature.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDAFeature.h        
 //
 //            wrapper class to wrap objects such that they can be added 
 //            to a generic store                     
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrackFeature.h, v0.0   Fri  7 Aug 2015 10:28:29 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeatureStore.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeatureStore.h
index daadbed7ddb..a663bd575ac 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeatureStore.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAFeatureStore.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDAFeatureStore.h        
 //
 //            Generic storage container - to contain objects wrapped 
 //            as Features      
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: FeatureStore.h, v0.0   Fri  7 Aug 2015 15:00:32 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoi.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoi.h
index bd95bcba18a..b79bc2ab93b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoi.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoi.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDARoi.h        
 //
 //            Roi class, contains RoiDescriptor and also a 
 //            vector of Tracks       
 // 
-//   Copyright (C) 2010 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDARoi.h, v0.0   Mon  1 Feb 2010 11:34:52 GMT sutt $
 
@@ -60,6 +62,7 @@ public:
   const std::vector<TrackTrigObject>& objects() const { return m_objects; }
   std::vector<TrackTrigObject>&       objects()       { return m_objects; }
   void addObject( const TrackTrigObject& o) {  m_objects.push_back(o); }
+  void addObjects( const std::vector<TrackTrigObject>& ob) {  m_objects.insert( m_objects.end(), ob.begin(), ob.end() ); }
 
   /// access the user data
   const std::vector<double>& user() const { return m_user; }
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiDescriptor.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiDescriptor.h
index 1bbb8bfc84f..6fcad025cee 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiDescriptor.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiDescriptor.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDARoiDescriptor.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDARoiDescriptor.h, v0.0   Tue 10 Nov 2009 10:05:35 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiParameters.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiParameters.h
index d4ac3e1a7d1..3c8d11529e0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiParameters.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDARoiParameters.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDARoiParameters.h        
 //
@@ -9,7 +12,6 @@
 //            class persistify the members of the class, recursively
 //            within itself          
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDARoiParameters.h, v0.0   Wed  4 Mar 2015 16:09:33 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h
index 2d1646941fb..4bb2fb34159 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDAVertex.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDAVertex.h        
 //
 //                   
 //  
-//   Copyright (C) 2010 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDAVertex.h, v0.0   Thu 22 Apr 2010 15:32:23 BST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h
index 79e9e3944c4..bff78068567 100755
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         TIDDirectory.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Track.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Track.h
index 5ad2802a054..093eae814b4 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Track.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/Track.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Track.h */
 
 #ifndef TIDA_TRACK_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h
index 07e5481e666..88121cfc165 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackAnalysis.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackAnalysis.h, v0.0   Sun 18 Jan 2009 19:53:18 GMT sutt $
 
@@ -112,6 +114,7 @@ public:
 public:
   /// FIXME: public for now, to avoid warnings about naming convention
   ///        violations.  Should be fixed properly after run2 finishes.
+
   /// identifier of the of the analysis - also used for the root
   ///  directory into which the histograms are put
   std::string   mname;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysisSequence.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysisSequence.h
index a05b210ae8e..dbd1c92a497 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysisSequence.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysisSequence.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackAnalysisSequence.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrackAnalysisSequence.h, v0.0   Tue  3 Nov 2009 17:01:50 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAssociator.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAssociator.h
index 29b283927d5..6ee330c2a4f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAssociator.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAssociator.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackAssociator.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackAssociator.h, v0.0   Sun 18 Jan 2009 19:08:11 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackFilter.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackFilter.h
index 20279aab587..eb17b53bfff 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackFilter.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackFilter.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackFilter.h        
 //            base class for a single track selection filter 
 //            so you can set parameters for complex track 
 //            selection       
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrackFilter.h, v0.0   Fri 16 Oct 2009 02:11:32 BST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackSelector.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackSelector.h
index 59b1b7fcbab..ecadea70f4b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackSelector.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackSelector.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // 
 // @file TrackSelector.h 
 //
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackTrigObject.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackTrigObject.h
index a9a6ea47c42..512027614bd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackTrigObject.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackTrigObject.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackTrigObject.h        
 //
 //                   
 //  
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrackTrigObject.h, v0.0   Mon  5 Nov 2012 00:07:15 GMT sutt $
 
@@ -75,6 +77,11 @@ inline std::ostream& operator<<( std::ostream& s, const TrackTrigObject& t ) {
 	   << "\tphi="  << t.phi()
 	   << "\tpt="   << t.pt()
 	   << " ]" << std::endl;
+  
+  for ( size_t i=0 ; i<t.children().size() ; i++ ) s << "  0x" << std::hex << t.children()[i] << std::dec;
+  s << "  )" ;
+
+  return s;
 }
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrigInDetAnalysisLinkDef.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrigInDetAnalysisLinkDef.h
index 86305206939..9785bd180dc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrigInDetAnalysisLinkDef.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrigInDetAnalysisLinkDef.h
@@ -1,3 +1,7 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
 #if defined(__CLING__) || defined( __MAKECINT__)
 #pragma link C++ namespace TIDA;
 #pragma link C++ class TIDA::Vertex+;
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/VertexAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/VertexAnalysis.h
index d67dc14a98c..a508c8c6744 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/VertexAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/VertexAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    VertexAnalysis.h        
 //
 //                   
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: VertexAnalysis.h, v0.0   Fri  7 Aug 2015 10:27:38 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TFileString.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TFileString.cxx
index 588da3b5e90..966aa77b677 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TFileString.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TFileString.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   TFileString.cxx        
 //
@@ -5,7 +8,6 @@
 //    to root files               
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TFileString.cxx, v0.0   Sat Mar 15 19:50:15 GMT 2008 sutt
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAChain.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAChain.cxx
index a1f66898534..d177381c4d3 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAChain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAChain.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDA::Chain.cxx         
 //   
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDA::Chain.cxx, v0.0   Tue  2 Feb 2010 00:09:33 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAEvent.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAEvent.cxx
index 6dd2458885b..e89fcf8793a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAEvent.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAEvent.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDA::Event.cxx         
 //   
@@ -5,7 +8,6 @@
 //            chains for trigger analysis      
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDA::Event.cxx, v0.0   Tue  2 Feb 2010 00:09:33 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoi.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoi.cxx
index 94e82ae66ed..f1dbaf48280 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoi.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoi.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDA::Roi.cxx         
 //   
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDA::Roi.cxx, v0.0   Tue  2 Feb 2010 00:11:09 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx
index 2c5d8e8b399..c8c85ddb1ae 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiDescriptor.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDARoiDescriptor.cxx         
 //   
 //            modified from the TrigRoiDescriptor
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: RoiDescriptor.cxx, v0.0   Tue 10 Nov 2009 10:15:40 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiParameters.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiParameters.cxx
index b8b01b06919..fd8378608bc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiParameters.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDARoiParameters.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDARoiParameters.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDARoiParameters.cxx, v0.0   Wed  4 Mar 2015 16:22:25 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertex.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertex.cxx
index be97aefa984..cf3d232af30 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertex.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TIDAVertex.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDA::Vertex.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2010 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDA::Vertex.cxx, v0.0   Thu 22 Apr 2010 17:12:40 BST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/Track.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/Track.cxx
index 1f59540a6ac..ae208251633 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/Track.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/Track.cxx
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*- 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Track.cxx */
 
 #include "TrigInDetAnalysis/Track.h"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TrackTrigObject.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TrackTrigObject.cxx
index 8fda4e0131a..95a53390cdc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TrackTrigObject.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/src/TrackTrigObject.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackTrigObject.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrackTrigObject.cxx, v0.0   Mon  5 Nov 2012 12:13:48 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h
index e71e6801980..45c345d2c12 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Ntuple.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file AnalysisConfig_Ntuple.h */
 
 #ifndef TrigInDetAnalysisExample_AnalysisConfig_Ntuple_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Tier0.h
index 4f8cfe1f4e3..15a5b37bdfd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Tier0.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/AnalysisConfig_Tier0.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file AnalysisConfig_Ntuple.h */
 
 #ifndef TrigInDetAnalysisExample_AnalysisConfig_Tier0_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Distribution.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Distribution.h
index 8823d0e912c..891dca04a68 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Distribution.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Distribution.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Resolution.h */
 
 #ifndef TrigInDetAnalysisExample_Analysis_Distribution_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Efficiency.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Efficiency.h
index f12fcdc020c..45a20f47e38 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Efficiency.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Efficiency.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Efficiency.h */
 
 #ifndef TrigInDetAnalysisExample_Analysis_Efficiency_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Fake.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Fake.h
index 381e75f4d4c..9193bcf362b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Fake.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Fake.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Fake.h */
 
 #ifndef TrigInDetAnalysisExample_Analysis_Fake_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Missed.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Missed.h
index 5f5a5759981..23af5d448d0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Missed.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Missed.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Missed.h */
 
 #ifndef TrigInDetAnalysisExample_Analysis_Missed_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Resolution.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Resolution.h
index d8112321e64..d798ccfedfa 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Resolution.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Resolution.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Resolution.h */
 
 #ifndef TrigInDetAnalysisExample_Analysis_Resolution_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_ResolutionCosmics.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_ResolutionCosmics.h
index ba85d68d104..dd55136a7d7 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_ResolutionCosmics.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_ResolutionCosmics.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_ResolutionCosmics.h */
 
 #ifndef TrigInDetAnalysisExample_Analysis_ResolutionCosmics_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h
index f86ce6b5236..88c52c2286b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/Analysis_Tier0.h
@@ -4,8 +4,8 @@
 //                    
 //   $Id: Analysis_Tier0.h   Thu 18 May 2017 15:29:53 CEST sutt $
 //
-//   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-//   Copyright (C) 2017 M Sutton (sutt@cern.ch)    
+//   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
 
 #ifndef TrigInDetAnalysisExample_Analysis_Tier0_H
 #define TrigInDetAnalysisExample_Analysis_Tier0_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/ChainString.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/ChainString.h
index fd734254557..4defaaa7f86 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/ChainString.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/ChainString.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-  
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    ChainString.cxx         
 //            parse an analysis chain specification
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: ChainString.h, v0.0   Thu 30 Apr 2015 14:03:50 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h
index d1300faa949..c4be658e121 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/NtupleTrackSelector.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef __NTUPLETRACKSELECTOR_H
 #define __NTUPLETRACKSELECTOR_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/SigAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/SigAnalysis.h
index db6b2574bda..e4c7c6b3e7e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/SigAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/SigAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    SigAnalysis.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: SigAnalysis.h, v0.0   Wed 28 Oct 2009 02:41:51 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
index 31aa3556283..2bd13e4ca02 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/T_AnalysisConfig_Tier0.h
@@ -12,11 +12,10 @@
 //                This would be a simple switch if the reference tracks
 //                were in the RoI, but they're not se we need to move the 
 //                RoI filtering to the test filter and *not* the reference 
-//                filter grrrrrr  
+//                filter 
 //
 // 
-//   Copyright (C) 2014 M.Sutton (sutt@cern.ch)    
-//   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+//   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: T_AnalysisConfig_Tier0.h  Tue 16 May 2017 09:28:55 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackDistributions.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackDistributions.h
index dadda109684..bb8480b8df2 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackDistributions.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackDistributions.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*- 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackEfficiency.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackEfficiency.h, v0.0   Sun 18 Jan 2009 19:08:11 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackEfficiency.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackEfficiency.h
index fd7d72bcbef..cc6ff4c5bc4 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackEfficiency.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrackEfficiency.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*- 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackEfficiency.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackEfficiency.h, v0.0   Sun 18 Jan 2009 19:08:11 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h
index b0739f1fa7c..64311b408c4 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestBase.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef __TRIGTESTBASE_H
 #define __TRIGTESTBASE_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h
index c0d1670df58..4803b29e7cf 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestMonToolAC.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef __TRIGTESTMONTOOLAC_H
 #define __TRIGTESTMONTOOLAC_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h
index 04712271910..7967ed6c41a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/TrigTestPhysValMon.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef __TRIGTESTPHYSVALMONTOOL_H
 #define __TRIGTESTPHYSVALMONTOOL_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/VtxAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/VtxAnalysis.h
index d305f4a6153..6ddaac2e3d3 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/VtxAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/TrigInDetAnalysisExample/VtxAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    VtxAnalysis.h        
 //
 //                   
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: VtxAnalysis.h, v0.0   Sun  9 Aug 2015 00:02:23 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
index ebe4de8402c..5fcd9f86bbf 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/AnalysisConfig_Ntuple.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    AnalysisConfig_Ntuple.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2010 M.Sutton (sutt@cern.ch)    
 
 
 #include <cstdio>
@@ -994,11 +996,14 @@ void AnalysisConfig_Ntuple::loop() {
 	  for ( int it=0 ; it<7 ; it++ ) if ( m_electronType[ielec]==ElectronRef[it] ) itype = it; 
 	  if ( itype<0 ) continue;
 
+	  std::vector<TrackTrigObject> elevec;
+	  
 	  //	  std::cout << "\tElectrons selection " << ielec << " " << m_electronType[ielec] 
 	  //		    << "\t" << itype << " " << ElectronRef[itype] << "\t" << m_rawElectrons[ielec] << std::endl;
 	  
-	  int Nel_ = processElectrons( selectorRef, itype, ( m_rawElectrons[ielec]=="raw" ? true : false ) );
-
+	  int Nel_ = processElectrons( selectorRef, &elevec, itype, ( m_rawElectrons[ielec]=="raw" ? true : false ) );
+	  
+	  	  
           if ( Nel_ < 1 ) continue;
       
           Nel += Nel_;	
@@ -1010,6 +1015,11 @@ void AnalysisConfig_Ntuple::loop() {
 	  m_event->addChain( echain );
 	  m_event->back().addRoi(TIDARoiDescriptor(true));
 	  m_event->back().back().addTracks(selectorRef.tracks());
+	  m_event->back().back().addObjects( elevec );
+
+	  // leave this in util fully validated ...
+	  // std::cout << m_event->back() << std::endl;
+	  
 	  if ( selectorRef.getBeamX()!=0 || selectorRef.getBeamY()!=0 || selectorRef.getBeamZ()!=0 ) { 
 	    std::vector<double> _beamline;
 	    _beamline.push_back( selectorRef.getBeamX() );
@@ -1104,7 +1114,9 @@ void AnalysisConfig_Ntuple::loop() {
 	  if  ( m_tauProngs[itau]=="3Prong" ) requireNtracks = 3;	
 	  if  ( m_tauProngs[itau]=="1Prong" ) requireNtracks = 1;
 
-	  int Ntau_ = processTaus( selectorRef, itype, requireNtracks, 20000 ); 
+	  std::vector<TrackTrigObject> tauvec; 
+
+	  int Ntau_ = processTaus( selectorRef, &tauvec, itype, requireNtracks, 20000 ); 
 
 	  Ntau += Ntau_;
 
@@ -1118,7 +1130,12 @@ void AnalysisConfig_Ntuple::loop() {
 	    m_event->addChain( tchain );
 	    m_event->back().addRoi(TIDARoiDescriptor(true));
 	    m_event->back().back().addTracks(selectorRef.tracks());
-	    
+
+	    m_event->back().back().addObjects( tauvec ) ; 
+
+	    // leave this in util fully validated ...
+	    //	    std::cout << m_event->back() << std::endl;
+
 	    if ( selectorRef.getBeamX()!=0 || selectorRef.getBeamY()!=0 || selectorRef.getBeamZ()!=0 ) { 
 	      std::vector<double> _beamline;
 	      _beamline.push_back( selectorRef.getBeamX() );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Distribution.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Distribution.cxx
index de455ea812c..291529a9e1c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Distribution.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Distribution.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 /** @file Analysis_Distribution.h */
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Efficiency.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Efficiency.cxx
index c6a9630d502..a05d75b6c3f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Efficiency.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Efficiency.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Efficiency.cxx */
 
 #include <cmath>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Fake.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Fake.cxx
index b9551a55df0..dfba5a80154 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Fake.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Fake.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Fake.cxx */
 
 #include <cmath>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Missed.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Missed.cxx
index 7d4aa277b42..d544e69be03 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Missed.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Missed.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Missed.h */
 
 #include <cmath>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Resolution.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Resolution.cxx
index c8c698e442a..64bc04ac492 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Resolution.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Resolution.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_Resolution.h */
 
 #include <cmath>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_ResolutionCosmics.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_ResolutionCosmics.cxx
index 8dc694da663..63a8bef2c62 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_ResolutionCosmics.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_ResolutionCosmics.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Analysis_ResolutionCosmics.h */
 
 #include <cmath>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
index aa3b07b0144..ab929abf20d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/Analysis_Tier0.cxx
@@ -3,8 +3,7 @@
 //                    
 //   $Id: Analysis_Tier0.cxx   Thu 18 May 2017 15:35:34 CEST sutt $
 //
-//   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-//   Copyright (C) 2017 M Sutton (sutt@cern.ch)    
+//   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #include <cmath>
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/ChainString.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/ChainString.cxx
index dded9d5aa1c..c8de37bbc7a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/ChainString.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/ChainString.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    ChainString.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: ChainString.cxx, v0.0   Thu 30 Apr 2015 14:06:56 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/SigAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/SigAnalysis.cxx
index 1de8ed4cd9a..1da57a6609a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/SigAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/SigAnalysis.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    SigAnalysis.cxx         
 //   
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: SigAnalysis.cxx, v0.0   Wed 28 Oct 2009 02:41:07 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackDistributions.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackDistributions.cxx
index 08a16f47d8a..3e410ff70a3 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackDistributions.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackDistributions.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackEfficiency.cxx         
 //   
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackEfficiency.cxx, v0.0   Mon 19 Jan 2009 17:25:51 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackEfficiency.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackEfficiency.cxx
index a8f0d3a16e9..10f11da23c9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackEfficiency.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrackEfficiency.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackEfficiency.cxx         
 //   
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackEfficiency.cxx, v0.0   Mon 19 Jan 2009 17:25:51 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx
index 97568697a23..f2b4f70e846 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestBase.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrigTestBase.cxx
 //   @author  Benjamin Sowden (benjamin.sowden@cern.ch)
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
index 49779481bab..dfdeda817d0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestMonToolAC.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrigTestMonToolAC.cxx         
 //   
 //            implementation of an IHLTMonToolAC 
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrigTestMonToolAC.cxx, v0.0  Wed 28 Oct 2009 02:23:23 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestPhysValMon.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestPhysValMon.cxx
index a9789b5549b..bada35bc638 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestPhysValMon.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/TrigTestPhysValMon.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrigTestPhysValMon.cxx         
 //   
 //            implementation of an IHLTMonToolAC 
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrigTestPhysValMon.cxx, v0.0  Wed 28 Oct 2009 02:23:23 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx
index b39d5902553..840f611cf68 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/src/VtxAnalysis.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    VtxAnalysis.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: VtxAnalysis.cxx, v0.0   Sun  9 Aug 2015 21:53:46 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx
index 0ea3602d6f7..6d35457ba0f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #include "AtlasLabels.h"
 
 #include "TLatex.h"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.h
index eb1cb2afef0..68ddc49a4e2 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.h
@@ -1,9 +1,11 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    AtlasLabels.h         
 //   
 //   @author M.Sutton
 // 
-//   Copyright (C) 2010 Atlas Collaboration
 //
 //   $Id: AtlasLabels.h, v0.0   Thu 25 Mar 2010 10:34:20 CET $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx
index 10f84b8a991..3c79c1d35d8 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 // ATLAS Style, based on a style file from BaBar
 //
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.h
index 85b027e457a..11f7e8954cc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    AtlasStyle.h         
 //   
@@ -6,7 +9,6 @@
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2010 Atlas Collaboration
 //
 //   $Id: AtlasStyle.h, v0.0   Thu 25 Mar 2010 10:34:20 CET $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h
index 69086aa69fe..f868c85ea1a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef __ATLASUTILS_H
 #define __ATLASUTILS_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h
index 6e0338db143..837b768d799 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    BinConfig.h        
 //            scales to modify the binning for histograms 
 //                   
 //  
-//   Copyright (C) 2014 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: BinConfig.h, v0.0   Thu 27 Feb 2014 07:57:21 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
index 5ad3ae9da6e..64690011c53 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    ConfAnalysis.cxx         
 //   
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: ConfAnalysis.cxx 800361 2017-03-12 14:33:19Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
index 58a58efb9db..c24ed890d12 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    ConfAnalysis.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: ConfAnalysis.h 800361 2017-03-12 14:33:19Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
index 76a31e9aa5d..688536dd2bb 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    ConfVtxAnalysis.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: ConfVtxAnalysis.cxx, v0.0   Sun  9 Aug 2015 21:53:46 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
index c30e3b4ac73..05304f68822 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    ConfVtxAnalysis.h        
 //
 //                   
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: ConfVtxAnalysis.h, v0.0   Sun  9 Aug 2015 00:02:23 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Contour.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Contour.h
index 4801f5e3a25..2271cde09de 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Contour.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Contour.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Contour.h        
 //
 //                   
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Contour.h, v0.0   Mon 17 Aug 2015 19:11:54 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/DrawLabel.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/DrawLabel.h
index c44adbd5849..2c82a61c646 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/DrawLabel.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/DrawLabel.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    DrawLabel.h        
 //
 //                   
 //  
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: DrawLabel.h, v0.0   Sun 11 Nov 2012 01:18:14 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx
index f17ad761c75..5a6a213f93f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    PurityAnalysis.cxx         
 //   
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: PurityAnalysis.cxx 688225 2015-08-07 20:12:06Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h
index a9d007d9a6f..27b51e11564 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    PurityAnalysis.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: PurityAnalysis.h 688225 2015-08-07 20:12:06Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h
index ea51bb8dbce..99488545cbc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    RoiFilter.h        
 //
 //                   
 //  
-//   Copyright (C) 2016 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: RoiFilter.h, v0.0   Sun 31 Jul 2016 05:22:41 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
index 0fb234432a5..5fa7f9225fd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    selectblock.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2017 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: selectblock.cxx, v0.0   Mon 23 Jan 2017 12:30:25 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
index 32b14b07bbc..35e3ca1c341 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <iostream>
 #include <string>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
index 4507d7ecc71..1c8f97b136e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    comparitor.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: comparitor.cxx, v0.0   Fri 12 Oct 2012 13:39:05 BST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
index 6d938d303f0..ad94f66d55e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    computils.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: comparitor.cxx, v0.0  Sat Aug 30 2014 14:38:03 CEST  sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
index 655ef43afb7..a561efae9b6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    computils.h         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: comparitor.cxx, v0.0   Sat Aug 30 2014 14:38:03 CEST  sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
index 471a0a3df66..fae1d55cfc5 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    cpucost.cxx
 //
 //
 //   @author B.Sowden
 //
-//   Copyright (C) 2014 B.Sowden (benjamin.sowden@cern.ch)
 //
 //   $Id: cpucost.cxx, v0.0   Mon 04 Aug 2014 10:45:00 BST bsowden $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h
index f8ea57abf21..6e488bf0687 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    dataset.h        
 //
 //                   
 //  
-//   Copyright (C) 2010 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: dataset.h 760843 2016-07-09 23:56:54Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h
index af92bd7b3ce..fc97046e79c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   @file         default_panels.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h
index f20a36deed9..8ac27521a00 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef EFFIC_INC
 #define EFFIC_INC
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/event_selector.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/event_selector.h
index 1518c60dc0f..544c1da823c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/event_selector.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/event_selector.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    event_selector.h        
 //
 //                   
 //  
-//   Copyright (C) 2010 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: event_selector.h 513250 2012-08-10 14:35:11Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx
index 08d8355b7c4..7011842259c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    fastadd.cxx         
 //            navigates through the directory structure of identically organised
@@ -5,7 +8,6 @@
 //            
 //   @author M.Sutton
 // 
-//   Copyright (C) 2013 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: fastadd.cxx, v0.0   Thu  5 Sep 2013 20:32:47 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
index e6e6a3d7bfb..c375bba82f4 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    globals.cxx         
 //   
@@ -6,7 +9,6 @@
 //
 //   $Id: globals.cxx, v0.0   Sun 12 Mar 2017 15:21:12 CET sutt $
 //
-//   Copyright (C) 2017 M Sutton (sutt@cern.ch)    
 
 #include "TrigInDetAnalysis/TIDARoiDescriptor.h"
 #include "TrigInDetAnalysis/TIDAEvent.h"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
index 0a7ef44fdb0..566ac334ebe 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    globals.h        
 //                    
 //
 //   $Id: globals.h, v0.0   Sun 12 Mar 2017 15:21:08 CET sutt $
 //
-//   Copyright (C) 2017 M Sutton (sutt@cern.ch)    
 
 #ifndef  GLOBALS_H
 #define  GLOBALS_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/grl_run.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/grl_run.h
index 471d445f3a6..76ecf2c0d4c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/grl_run.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/grl_run.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    grl_run.h        
 //
@@ -6,7 +9,6 @@
 //            run number and a vector of ( first, last ) pairs of valid 
 //            lumi block ranges                   
 //  
-//   Copyright (C) 2016 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: grl_run.h, v0.0   Mon 24 Oct 2016 17:12:10 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/label.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/label.h
index 390d2588cea..5ccd32fc21a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/label.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/label.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    label.h        
 //
 //                   
 //  
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: label.h, v0.0   Sun 26 Aug 2012 21:32:27 BST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/listroot.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/listroot.cxx
index 7066c68bd51..a1cc64bb45b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/listroot.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/listroot.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "simpletimer.h"
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h
index 49552721470..03db0e18bc3 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    lumiList.h        
 //            standalone implementation of a good lumi 
 //            block list       
 //  
-//   Copyright (C) 2010 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: lumiList.h 780225 2016-10-25 10:04:58Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
index 893d5527c2a..7d2f08d012b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    lumiParser.h        
 //
 //                   
 //  
-//   Copyright (C) 2016 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: lumiparser.h, v0.0   Tue 12 Jul 2016 13:47:00 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx
index 287f50c75eb..db59d79bce6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // Author: J.Kirk (modified from copyFiles.C in ROOT tutuorial
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/reader.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/reader.cxx
index ad4eb76d330..f489114aa81 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/reader.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/reader.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    reader.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: reader.cxx, v0.0   Mon 30 Jan 2012 18:43:21 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/refit.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/refit.cxx
index 3604e3e578c..d07099b01f9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/refit.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/refit.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    refit.cxx         
 //            navigates through the directory structure of a file copying 
@@ -6,7 +9,6 @@
 //            
 //   @author M.Sutton
 // 
-//   Copyright (C) 2013 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: refit.cxx, v0.0   Thu  5 Sep 2013 20:32:47 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
index 225badee73a..dec4df86b15 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <cstdio>
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx
index 1063722da56..d3f8c95f23e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    runtool.cxx         
 //   
 //
 //   @Author.Sutton
 // 
-//   Copyright (C) 2016 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: runtool.cxx, v0.0   Mon 24 Oct 2016 15:25:43 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/simpletimer.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/simpletimer.h
index 24637f06c67..39596f3d0fc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/simpletimer.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/simpletimer.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    simpletimer.h        
 //            these functions have a precision of about 0.001 ms
 //
 //
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: simpletimer.h, v0.0   Thu 22 Jan 2009 15:51:52 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
index 5c440c3aaef..3274438f7be 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    reader.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: reader.cxx, v0.0   Mon 30 Jan 2012 18:43:21 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/wmain.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/wmain.cxx
index dda434890fc..9fa499d2742 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/wmain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/wmain.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <iostream>
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/zbeam.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/zbeam.h
index 5a257efe747..880b2603be8 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/zbeam.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/zbeam.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    zbeam.h        
 //
 //                   
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: zbeam.h, v0.0   Thu 30 Jul 2015 10:50:19 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx
index 9862f539c6e..638f7904cdf 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 /**************************************************************************
  **
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h
index 00c99e8e7ea..11ee7b26593 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         IReadCards.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
index e01455013f8..7ba420b771e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         ReadCards.cxx        
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h
index f728ed23259..5497002ecb0 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         ReadCards.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx
index fd27ffa5dd7..e1ffbc2f5bb 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 /**************************************************************************
  **
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h
index 9c1d74031d3..1e34d423052 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*- 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         Value.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx
index 585aaf0e847..b16a7d79481 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 
 #include <iostream>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
index 229ca2653de..d014f435162 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 /**************************************************************************
  **
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
index 6b5b1c2ec8b..27a15df7118 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         utils.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h
index 9db12ea5ea8..8f3f7845518 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    BasicRandom.h        
 //            a Randomnumber generator with a data member TRandom3
@@ -15,7 +18,6 @@
 //            This wrapper is to avoid global variables cluttering 
 //            up the place - root is bad enough as it is.
 //
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: BasicRandom.h, v0.0   Fri 27 Jan 2012 11:39:47 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h
index 91b6eaba028..9c1b0528c37 100755
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         Directory.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h
index ceb2799ac1a..86367d45ab5 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Random.h        
 //            singleton random number generator wrapper, for the 
@@ -8,7 +11,6 @@
 //            This wrapper is to avoid global variables cluttering 
 //            up the place - root is bad enough as it is.
 //
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Random.h, v0.0   Fri 27 Jan 2012 11:39:47 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
index 718ed172dfe..1b4d110bc03 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 /**************************************************************************
  **
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
index 11b76fc3c7a..5a666e2ac12 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         Resplot.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h
index 8b070cdd4e7..b1028517013 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         StatVal.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx
index 72b588bb531..c4a3ae3d910 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <cmath>
 #include <vector>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h
index ef513b3da0b..cd5fcf6763e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef GENERATE_H
 #define GENERATE_H
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx
index 286e14e785f..427ff9fbfa8 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include <cmath>
 #include <vector>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx
index 5abf6a9ada5..da30e167c82 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 
 #include <cmath>
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h
index 934964393ff..69843018eb8 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 
 #ifndef RMSFRAC_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h
index 337eb8e47ca..074dbbf6ada 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /**************************************************************************
  **
  **   File:         tagname.h  
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAparseGRL.py b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAparseGRL.py
index 35fad4c1dc3..8170570f959 100755
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAparseGRL.py
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAparseGRL.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 __author__ = "Callum Kilby"
-__copyright__ = "Copyright 2016, Callum Kilby"
 
 import sys
 import getopt
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_BestMatch.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_BestMatch.h
index e84ee9b9e6d..fe5798cedca 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_BestMatch.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_BestMatch.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Associator_BestMatch.h         
 //   
 //            Erkcan's track matchers 
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Associator_BestMatch.h, v0.0   Wed 28 Oct 2009 02:23:23 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaEtaPhi.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaEtaPhi.h
index 5c01af96876..1fe4c1ab548 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaEtaPhi.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaEtaPhi.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Associator_DeltaEtaPhi.h */
 /// Fixme: needs to be replaced by something inheriting 
 ///        from BestMatcher
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaR.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaR.h
index 4064322b0d6..475190e1dcd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaR.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaR.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // @file Associator_DeltaR.h */
 
 #ifndef TrigInDetAnalysisUtils_Associator_DeltaR_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaRCosmics.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaRCosmics.h
index 3852fbaae86..af3518b95b3 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaRCosmics.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_DeltaRCosmics.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Associator_DeltaRCosmics.h */
 
 #ifndef TrigInDetAnalysisUtils_Associator_DeltaRCosmics_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
index 6e2c977b2e5..bbb376f400c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Associator_TruthMatch.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef __ASSOCIATOR_TRUTHMATCH_H
 #define __ASSOCIATOR_TRUTHMATCH_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/BestMatcher.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/BestMatcher.h
index 80f439bb765..26cd20fcd3f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/BestMatcher.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/BestMatcher.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    BestMatcher.h        
 //
@@ -6,7 +9,6 @@
 //            algorithm based on an efficient implementation of 
 //            the "best matcher" algorithm from Ercan Ozcan 
 // 
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: BestMatcher.h, v0.0   Mon 10 Aug 2015 03:07:24 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h
index bbbfccaac7e..1d69d3e8863 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Offline2017.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Filter_Offline2017.h        
 //
@@ -6,23 +9,6 @@
 //            on hadronic tracks as found in 
 //              https://twiki.cern.ch/twiki/bin/viewauth/AtlasProtected/TrackingCPPreRecsSummer2017
 // 
-//   Copyright (C) 2017 M.Sutton (sutt@cern.ch)    
-//
-//   This program is free software; you can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your option) any later version.
-//    
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//   
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
-//   MA  02110-1301, USA.
-//
 
 
 #ifndef TRIGINDETANALYSISUTILS_FILTER_OFFLINE2017_H 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoIMatching.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoIMatching.h
index 8be32321ec1..39adc59a0f2 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoIMatching.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoIMatching.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Filter_RoIMatching.h */
 
 #ifndef TrigInDetAnalysisUtils_Filter_RoIMatching_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoiSelector.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoiSelector.h
index c8b7b86d93d..55f7d22c695 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoiSelector.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_RoiSelector.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Filter_RoiSelector.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Filter_RoiSelector.h, v0.0   Wed 28 Oct 2009 02:44:40 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Track.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Track.h
index 60f5913c7cf..6a19b14bc23 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Track.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_Track.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Filter_Track.h        
 //
@@ -13,7 +16,6 @@
 //                   }
 //                };                       
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Filter_Track.h, v0.0   Wed 28 Oct 2009 02:47:05 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackHits.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackHits.h
index e33dc66f2cb..ae86f999004 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackHits.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackHits.h
@@ -1,4 +1,7 @@
 /** emacs: this is -*- c++ -*- 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Filter_TrackHits.h */
 
 #ifndef TrigInDetAnalysisUtils_Filter_TrackHits_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackParameters.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackParameters.h
index e0daf9caa1f..e27ae34d76e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackParameters.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackParameters.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Filter_TrackParameters.h */
 
 #ifndef TrigInDetAnalysisUtils_Filter_TrackParameters_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackQuality.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackQuality.h
index cc1e4007eea..19786b61dcf 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackQuality.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_TrackQuality.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file Filter_TrackQuality.h */
 
 #ifndef TrigInDetAnalysisUtils_Filter_TrackQuality_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_etaPT.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_etaPT.h
index 584896dc5ba..90bdc2c86be 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_etaPT.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filter_etaPT.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    Filter_etaPT.h        
 //
 //            generic track filter to filter on eta and PT only
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Filter_PT.h, v0.0   Wed 28 Oct 2009 02:47:05 CET sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filters.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filters.h
index c13d5584f21..855f5a4980b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filters.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/Filters.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 // emacs: this is -*- c++ -*-
 //
 //   @file    Filters.h        
 //
 //                   
 //  
-//   Copyright (C) 2012 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: Filters.h 767214 2016-08-10 12:23:36Z sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h
index 96615622d0a..8333e2d7fa9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/OfflineObjectSelection.h
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 #ifndef TrigInDetAnalysisExample_OfflineObjectSelection_H
 #define TrigInDetAnalysisExample_OfflineObjectSelection_H
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TIDARoiDescriptorBuilder.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TIDARoiDescriptorBuilder.h
index 38511358fb8..f1af39d41e5 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TIDARoiDescriptorBuilder.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TIDARoiDescriptorBuilder.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TIDARoiDescriptorBuilder.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TIDARoiDescriptorBuilder.h, v0.0   Tue 10 Nov 2009 11:12:38 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
index 60dfedb78bc..acf26c1f744 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 /** @file AnalysisConfig.h */
 
 #ifndef TrigInDetAnalysisUtils_T_AnalysisConfig_H
@@ -26,7 +29,7 @@
 // #include "TrigInDetAnalysisUtils/Converter.h"
 #include "TrigInDetAnalysisUtils/TrigTrackSelector.h"
 #include "TrigInDetAnalysisUtils/OfflineObjectSelection.h"
-
+#include "TrigInDetAnalysis/TrackTrigObject.h"
 #include "TrigInDetTruthEvent/TrigInDetTrackTruthMap.h"
 
 #ifdef XAODTRACKING_TRACKPARTICLE_H
@@ -466,7 +469,9 @@ protected:
   ////////////////////////////////////////////////////////////////////////////////////////////
   /// select offline electrons
   ////////////////////////////////////////////////////////////////////////////////////////////
-  unsigned processElectrons( TrigTrackSelector& selectorRef, const unsigned int selection=0, 
+  unsigned processElectrons( TrigTrackSelector& selectorRef,
+			     std::vector<TrackTrigObject>* elevec=0,
+			     const unsigned int selection=0, 
 			     bool   raw_track=false,  
 			     double ETOffline=0,
 #                            ifdef XAODTRACKING_TRACKPARTICLE_H
@@ -524,8 +529,21 @@ protected:
 #     endif
 
       if (good_electron) { 
-	if ( raw_track ) selectorRef.selectTrack( xAOD::EgammaHelpers::getOriginalTrackParticle( *elec ) );
-	else             selectorRef.selectTrack( (*elec)->trackParticle() );
+	const xAOD::Electron_v1& eleduff = *(*elec);
+	long unsigned   eleid  = (unsigned long)(&eleduff) ;
+	TrackTrigObject eleobj = TrackTrigObject( (*elec)->eta(),
+						  (*elec)->phi(),
+						  (*elec)->pt(),
+						  0,
+						  (*elec)->type(),
+						  eleid );
+	
+	bool trk_added ;
+	if ( raw_track ) trk_added = selectorRef.selectTrack( xAOD::EgammaHelpers::getOriginalTrackParticle( *elec ) );
+	else             trk_added = selectorRef.selectTrack( (*elec)->trackParticle() );
+	
+	if (trk_added) eleobj.addChild( selectorRef.tracks().back()->id() );
+	if (elevec)    elevec->push_back( eleobj ); 
       }
     }
 
@@ -535,7 +553,7 @@ protected:
 
 
   ////////////////////////////////////////////////////////////////////////////////////////////
-  /// select offline muons
+  /// select offlinqe muons
   ////////////////////////////////////////////////////////////////////////////////////////////
   unsigned processMuons(     TrigTrackSelector& selectorRef,  const unsigned int selection=0, 
 			     double ETOffline=0,
@@ -595,6 +613,7 @@ protected:
     /// select offline taus
     ////////////////////////////////////////////////////////////////////////////////////////////
 unsigned processTaus( TrigTrackSelector& selectorRef,
+		      std::vector<TrackTrigObject>* tauvec=0,
 		      const unsigned selection=0,
 		      int            requireNtracks=0,
 		      double         EtCutOffline=0,
@@ -665,14 +684,26 @@ unsigned processTaus( TrigTrackSelector& selectorRef,
     //   std::cout << "SUTT tau ntracks: " << N << "\tgoodtau: " << good_tau << "\tpt: " << (*tau)->p4().Et() << "\t3prong: " << doThreeProng << std::endl;  
       
     if (good_tau){
+      const xAOD::TauJet_v3& duff = *(*tau);
+      long unsigned tauid = (unsigned long)(&duff) ;
+      TrackTrigObject tauobj = TrackTrigObject( (*tau)->eta(),
+						(*tau)->phi(),
+						(*tau)->pt(),
+						0,
+						(*tau)->type(),
+						tauid );
+      
+      bool trk_added;
       for ( unsigned i=N ; i-- ; )  {
 #       ifdef XAODTAU_TAUTRACK_H  
-        selectorRef.selectTrack((*tau)->track(i)->track());
+        trk_added = selectorRef.selectTrack((*tau)->track(i)->track());
 #       else
-        selectorRef.selectTrack((*tau)->track(i));
+        trk_added = selectorRef.selectTrack((*tau)->track(i));
 #       endif
         Ntaus++;
+	if ( trk_added ) tauobj.addChild( selectorRef.tracks().back()->id() );
       }
+      if ( tauvec ) tauvec->push_back( tauobj );
     }
   }
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaR.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaR.h
index 56bd6b1d27c..32b6e3eec9c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaR.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaR.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackMatchDeltaR.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackMatchDeltaR.h, v0.0   Sun 18 Jan 2009 19:40:47 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaRCosmic.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaRCosmic.h
index d5f6066c0c4..c53663d4ebe 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaRCosmic.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrackMatchDeltaRCosmic.h
@@ -1,11 +1,13 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrackMatchDeltaRCosmic.h        
 //            
 //            checks if track is within DeltaR of cosmic, or within 
 //            DeltaR back to back       
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackMatchDeltaRCosmic.h, v0.0   Sun 18 Jan 2009 19:40:47 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h
index e377049ed52..e77b6d28bfc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/TrigTrackSelector.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #ifndef TRIGINDETANALYSISUTILS_TRIGTRACKSELECTOR_H
 #define TRIGINDETANALYSISUTILS_TRIGTRACKSELECTOR_H
@@ -76,14 +79,14 @@ public:
   virtual void clear() { for ( unsigned i=mtracks.size() ; i-- ; ) delete mtracks[i]; mtracks.clear(); }   
 
 
-  void selectTrack( const TrigInDetTrack* track, const TrigInDetTrackTruthMap* truthMap=0 );
+  bool selectTrack( const TrigInDetTrack* track, const TrigInDetTrackTruthMap* truthMap=0 );
 
 
   // extract all the tracks from a TrigInDetTrack collection and associated TruthMap and convert them
   void selectTracks( const TrigInDetTrackCollection* trigtracks, const TrigInDetTrackTruthMap* truthMap=0 );
 
   // add a TrackParticle 
-  void selectTrack( const Rec::TrackParticle* track );
+  bool selectTrack( const Rec::TrackParticle* track );
   
 
   // extract all the tracks from a TrackParticle collection and add them
@@ -95,14 +98,14 @@ public:
 
 
   // add a TruthParticle from a GenParticle - easy, bet it doesn't work 
-  void selectTrack( const HepMC::GenParticle* track );
+  bool selectTrack( const HepMC::GenParticle* track );
 
 
   // add a TruthParticle 
-  void selectTrack( const TruthParticle& track );
+  bool selectTrack( const TruthParticle& track );
 
   // add a TruthParticle 
-  void selectTrack( const TruthParticle* track );
+  bool selectTrack( const TruthParticle* track );
 
 
   // make a TIDA::Track from a GenParticle 
@@ -113,7 +116,7 @@ public:
 
 
   // add a Trk::Track
-  void selectTrack( const Trk::Track* track );
+  bool selectTrack( const Trk::Track* track );
 
   
   // extract all the tracks from a TrackCollection and add them
@@ -122,7 +125,7 @@ public:
 
 #ifdef XAODTRACKING_TRACKPARTICLE_H
 
-  void selectTrack( const xAOD::TrackParticle* track, void* =0);
+  bool selectTrack( const xAOD::TrackParticle* track, void* =0);
 
 
   void selectTracks( const xAOD::TrackParticleContainer* tracks, void* =0);
@@ -150,5 +153,4 @@ private:
 };
 
 
-
 #endif // TRIGINDETANALYSISUTILS_TRIGTRACKSELECTOR_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexAssociator.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexAssociator.h
index daa67229f70..4981c9fe229 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexAssociator.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexAssociator.h
@@ -1 +1,4 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h
index 99887f70b63..e9b733f2356 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/VertexMatcher.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    VertexMatcher.h        
 //
 //                   
 //  
-//   Copyright (C) 2015 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: VertexMatcher.h, v0.0   Mon 10 Aug 2015 17:47:51 CEST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/particleType.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/particleType.h
index 21a9326b7d1..ba6b4f31867 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/particleType.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/particleType.h
@@ -1,4 +1,7 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    particleType.h        
 //            a class of my own because ttying to access the  
@@ -8,7 +11,6 @@
 //            As it happens, this class has no data memebrs,
 //            but derives from an std::map
 //  
-//   Copyright (C) 2011 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: particleType.h, v0.0   Thu 14 Jul 2011 09:50:36 BST sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
index a6ff8c52c18..a10d2db26bd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/OfflineObjectSelection.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 
 #include "TrkTrackSummary/TrackSummary.h"
 #include "TrigInDetAnalysisUtils/OfflineObjectSelection.h"
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
index b232c840023..dd64fdc1f25 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/src/TrigTrackSelector.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrigTrackSelector.cxx         
 //   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2014 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrigTrackSelector.cxx, v0.0   Sun  2 Nov 2014 11:10:06 CET sutt $
 
@@ -18,7 +20,7 @@ TrigTrackSelector::TrigTrackSelector( TrackFilter* selector ) :
     m_correctTrkTracks(false) {  } 
 
 
-void TrigTrackSelector::selectTrack( const TrigInDetTrack* track, const TrigInDetTrackTruthMap* truthMap ) {     
+bool TrigTrackSelector::selectTrack( const TrigInDetTrack* track, const TrigInDetTrackTruthMap* truthMap ) {     
     // do the track extraction stuff here....
     if ( track ) { 
 
@@ -79,8 +81,13 @@ void TrigTrackSelector::selectTrack( const TrigInDetTrack* track, const TrigInDe
 	
 	//	std::cout << "SUTT ID track " << *t << "\t0x" << std::hex << track->HitPattern() << std::dec << std::endl;
 	
-	if ( !addTrack( t ) ) delete t;
+	if ( !addTrack( t ) ){
+	  delete t;
+	  return false;
+	}	
+	return true;
     }
+    return false;
 }
 
 
@@ -97,7 +104,7 @@ void TrigTrackSelector::selectTracks( const TrigInDetTrackCollection* trigtracks
 
 
 // add a TrackParticle 
-void TrigTrackSelector::selectTrack( const Rec::TrackParticle* track ) { 
+bool TrigTrackSelector::selectTrack( const Rec::TrackParticle* track ) { 
         
     // do the track extraction stuff here....
 
@@ -225,9 +232,14 @@ void TrigTrackSelector::selectTrack( const Rec::TrackParticle* track ) {
 
       //      std::cout << "SUTT TP track " << *t << "\t0x" << std::hex << bitmap << std::dec << std::endl; 
       
-      if ( !addTrack( t ) ) delete t;
+      if ( !addTrack( t ) ){
+	delete t;
+	return false;
+      }
+      return true;
       
     }
+    return false;
 }
   
 
@@ -272,26 +284,39 @@ void TrigTrackSelector::selectTracks( const TruthParticleContainer* truthtracks
 
 
 // add a TruthParticle from a GenParticle - easy, bet it doesn't work 
-void TrigTrackSelector::selectTrack( const HepMC::GenParticle* track ) {
+bool TrigTrackSelector::selectTrack( const HepMC::GenParticle* track ) {
   
     /// not a "final state" particle
-    if ( track->status() != 1 ) return;
+    if ( track->status() != 1 ) return false;
 
     /// set this so can use it as the identifier - don't forget to reset!!
-    m_id = (unsigned long)track; 
-    selectTrack( TruthParticle(track) );
+    m_id = (unsigned long)track;
+    bool sel;
+    sel = selectTrack( TruthParticle(track) );
     m_id = 0;
+    
+    return sel; 
+    
 }
 
 
 // add a TruthParticle 
-void TrigTrackSelector::selectTrack( const TruthParticle& track ) { selectTrack( &track ); }
+bool TrigTrackSelector::selectTrack( const TruthParticle& track ) {
+
+  return selectTrack( &track );
+  
+}
 
 
 // add a TruthParticle 
-void TrigTrackSelector::selectTrack( const TruthParticle* track ) { 
+bool TrigTrackSelector::selectTrack( const TruthParticle* track ) { 
     TIDA::Track* t = makeTrack( track, m_id );
-     if ( t && !addTrack(t) ) delete t;
+    if ( t == 0 ) return false;
+    if ( !addTrack(t) ) {
+      delete t;
+      return false;
+    }
+    return true;
 }
 
 
@@ -507,7 +532,7 @@ TIDA::Track* TrigTrackSelector::makeTrack( const TruthParticle* track, unsigned
 
 
 // add a Trk::Track
-void TrigTrackSelector::selectTrack( const Trk::Track* track ) { 
+bool TrigTrackSelector::selectTrack( const Trk::Track* track ) { 
         
     // do the track extraction stuff here....
 
@@ -673,13 +698,19 @@ void TrigTrackSelector::selectTrack( const Trk::Track* track ) {
                                          trackAuthor,  false, -1, -1,  
                                          expectBL, id) ;  
 
-	 if ( !addTrack( t ) ) delete t;
-
-	 //std::cout << "SUTT TP track " << *t << "\t0x" << std::hex << bitmap << std::dec << std::endl; 
+	if ( !addTrack( t ) ){
+	  delete t;
+	  return false;
+	}
+	return true;
+	
+	//std::cout << "SUTT TP track " << *t << "\t0x" << std::hex << bitmap << std::dec << std::endl; 
       }
     }
+    
+    return false;
 }
-  
+
 // extract all the tracks from a TrackCollection and add them
 void  TrigTrackSelector::selectTracks( const TrackCollection* trigtracks ) { 
     
@@ -698,7 +729,7 @@ void  TrigTrackSelector::selectTracks( const TrackCollection* trigtracks ) {
 
 #ifdef XAODTRACKING_TRACKPARTICLE_H
 
-void TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
+bool TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
      
     // do the track extraction stuff here....
 
@@ -754,7 +785,6 @@ void TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
       uint8_t sum_nBlayerHits = 0;
       track->summaryValue( sum_nBlayerHits, xAOD::numberOfInnermostPixelLayerHits);
       int nBlayerHits = 2*sum_nBlayerHits;
-
       uint8_t  sum_nPixelHits = 0;
       track->summaryValue( sum_nPixelHits, xAOD::numberOfPixelHits);
       int nPixelHits = 2*sum_nPixelHits;
@@ -823,11 +853,6 @@ void TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
       const Trk::Track*   _track =  track->track().getDataPtr();
       if ( _track ) { 
       
-	/// This is Soooo isHit, xAOD::TrackParticle::track() is supposed to produce a 
-	/// Trk::Track* in the new code, but an ElementLink<TrackContainer> in the old version
-	/// so to test with the old release use the ElementLink, but this just doesn't
-	/// compile, so give up on this ***REMOVED*** code.   
-	//   const Trk::TrackSummary*  summary = track->track()->trackSummary();
 	const Trk::TrackSummary*  summary = _track->trackSummary();
 	
 	if(summary==0){
@@ -842,15 +867,6 @@ void TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
 #endif
 #endif
 
-      /// Now some *ridiculous* code to get the author of the 
-      /// TrackParticle (offline) tracks
-      
-      //      std::cout << "fetching author info :" << track->info().trackFitter() << ":" 
-      //		<< track->info().dumpInfo() << ": bm 0x" << std::hex << bitmap << std::dec << std::endl;
-
-
-      //      int trackAuthor = -1; 
-
       int trackAuthor = 0;
 
       int fitter = track->trackFitter();
@@ -904,10 +920,14 @@ void TrigTrackSelector::selectTrack( const xAOD::TrackParticle* track, void* ) {
 
       //      std::cout << "SUTT TP track " << *t << "\t0x" << std::hex << bitmap << std::dec << std::endl; 
       
-      if ( !addTrack( t ) ) delete t;
+      if ( !addTrack( t ) ){
+	delete t;
+	return false;
+      }
+      return true;
       
     }
-
+    return false;
      
 
 }
diff --git a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h
index 80f922c812d..e3a24116f30 100755
--- a/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h
+++ b/Trigger/TrigEvent/TrigInDetEvent/TrigInDetEvent/TrigVertex.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef TRIGINDETEVENT_TRIGVERTEX_H
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h
index 669b21cc5dc..2c5082b1a9c 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/AnalysisConfig_Jpsi.h
@@ -1,7 +1,7 @@
 // emacs: this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file AnalysisConfig_Jpsi.h */
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiAnalysis.h b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiAnalysis.h
index e32e3db88ef..7e0fb6e7566 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiAnalysis.h
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiAnalysis.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    JpsiAnalysis.h       
 //
 //                   
 //
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)   
 //
 //   $Id: SigAnalysis.h, v0.0   Wed 28 Oct 2009 02:41:51 CET sutt $
 
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiEfficiency.h b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiEfficiency.h
index d08a2badf3f..1fd2066756b 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiEfficiency.h
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/TrigIDJpsiMonitoring/JpsiEfficiency.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*- 
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    JpsiEfficiency.h        
 //
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: TrackEfficiency.h, v0.0   Sun 18 Jan 2009 19:08:11 GMT sutt $
 
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx
index dfa9d7847dc..42e4b41311e 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/AnalysisConfig_Jpsi.cxx
@@ -1,7 +1,7 @@
 // emacs: this is -*- c++ -*-
 
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /** @file AnalysisConfig_Jpsi.cxx */
@@ -105,18 +105,8 @@ void AnalysisConfig_Jpsi::loop() {
       
       if( m_iBeamCondSvc ) {
 
-// #ifndef TIDA_NEWTRACKING_H
-//         HepGeom::Point3D<double> vertex = m_iBeamCondSvc->beamPos();
-//         //if(fabs(xbeam-vertex.x())>0.1 || fabs(ybeam-vertex.y())>0.1){
-//           //m_provider->msg(MSG::INFO) << " using beam position\tx=" << vertex.x() << "\ty=" << vertex.y() << endmsg; 
-//         //}
-//         xbeam = vertex.x();
-//         ybeam = vertex.y();
-// #
-// else 
 	xbeam = m_iBeamCondSvc->beamPos()[0];
 	ybeam = m_iBeamCondSvc->beamPos()[1];
-// #endif
  
         m_analysis->setBeamRef( xbeam, ybeam );
       }
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/TrigJpsiMonTool.cxx b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/TrigJpsiMonTool.cxx
index 8c17109090b..4538db4c238 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/TrigJpsiMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/src/TrigJpsiMonTool.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    TrigJpsiMonTool.cxx         
 //   
 //            implementation of an IHLTMonToolAC 
 //                   
 // 
-//   Copyright (C) 2007 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: TrigTestMonToolAC.cxx, v0.0  Wed 28 Oct 2009 02:23:23 CET sutt $
 /** @author Mark Sutton (sutt@cern.ch) **/
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/python/TrigIDTPMonitorMonitoring.py b/Trigger/TrigMonitoring/TrigIDTPMonitor/python/TrigIDTPMonitorMonitoring.py
index 05f0f17c804..f5e827d029d 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/python/TrigIDTPMonitorMonitoring.py
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/python/TrigIDTPMonitorMonitoring.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
 
@@ -280,27 +280,27 @@ class TrigIDTPMonitorElectronMonitorBase(TrigGenericMonitoringToolConfig):
 
         #MONITORING THE IBL
         #Innermost detector hit efficiency profiles in bins of probe track (PT): eta and phi
-        self.Histograms += [ defineHistogram('PTeta, PTpixelFound', type='TProfile', title="Innermost layer of detector - Observed Tracks/Expected Tracks (pixel) for Precision Tracker vs eta; eta [radians]",
+        self.Histograms += [ defineHistogram('PTeta, PTpixelFound', type='TProfile', title="Expected && Found hit (IBL) for Precision Tracker vs eta; eta [radians]",
                                              xbins=15, xmin=-3, xmax=3,
                                              ymin=-0.1, ymax=1.1) ]
-        self.Histograms += [ defineHistogram('PTphi, PTpixelFound', type='TProfile', title="Innermost layer of detector - Observed Tracks/Expected Tracks (pixel) for Precision Tracker vs phi; phi [radians]",
-                                             xbins=9, xmin=-3.14, xmax=3.14,
+        self.Histograms += [ defineHistogram('PTphi, PTpixelFound', type='TProfile', title="Expected && Found hit (IBL) for Precision Tracker vs phi; phi [radians]",
+                                             xbins=14, xmin=-3.14, xmax=3.14,
                                              ymin=-0.1, ymax=1.1) ]
         #2D profile histogram of inner detector region
-        self.Histograms += [ defineHistogram('PTeta, PTphi, PTpixelFound', type='TProfile2D', title="Innermost layer of detector - Observed Tracks/Expected Tracks (pixel) for region; eta; phi",
+        self.Histograms += [ defineHistogram('PTeta, PTphi, PTpixelFound', type='TProfile2D', title="Expected && Found hit (IBL) for region; eta; phi",
                                              xbins=10, xmin=-3, xmax=3,
-                                             ybins=10, ymin=-3.14, ymax=3.14, zmin=-0.1, zmax=1.1) ]
+                                             ybins=14, ymin=-3.14, ymax=3.14, zmin=-0.1, zmax=1.1) ]
         #Next to Innermost detector hit efficiency profiles in bins of probe track (PT): eta and phi
-        self.Histograms += [ defineHistogram('PTeta, PTpixelNextToFound', type='TProfile', title="Next to innermost layer of detector - Observed Tracks/Expected Tracks (pixel) for Precision Tracker vs eta; eta [radians]",
+        self.Histograms += [ defineHistogram('PTeta, PTpixelNextToFound', type='TProfile', title="Next to innermost layer of detector - Expected && Found hit (L0) for Precision Tracker vs eta; eta [radians]",
                                              xbins=15, xmin=-3, xmax=3,
                                              ymin=-0.1, ymax=1.1) ]
-        self.Histograms += [ defineHistogram('PTphi, PTpixelNextToFound', type='TProfile', title="Next to innermost layer of detector - Observed Tracks/Expected Tracks (pixel) for Precision Tracker vs phi; phi [radians]",
-                                             xbins=9, xmin=-3.14, xmax=3.14,
+        self.Histograms += [ defineHistogram('PTphi, PTpixelNextToFound', type='TProfile', title="Next to innermost layer of detector - Expected && Found hit (L0) for Precision Tracker vs phi; phi [radians]",
+                                             xbins=22, xmin=-3.14, xmax=3.14,
                                              ymin=-0.1, ymax=1.1) ]
         #2D profile histogram of inner detector region
-        self.Histograms += [ defineHistogram('PTeta, PTphi, PTpixelNextToFound', type='TProfile2D', title="Next to innermost layer of detector - Observed Tracks/Expected Tracks (pixel) for region; eta; phi",
+        self.Histograms += [ defineHistogram('PTeta, PTphi, PTpixelNextToFound', type='TProfile2D', title="Next to innermost layer of detector - Expected && Found hit (L0) for region; eta; phi",
                                              xbins=10, xmin=-3, xmax=3,
-                                             ybins=10, ymin=-3.14, ymax=3.14, zmin=-0.1, zmax=1.1) ]
+                                             ybins=22, ymin=-3.14, ymax=3.14, zmin=-0.1, zmax=1.1) ]
     
 
 class TrigIDTPMonitorElectronOnlineMonitor(TrigIDTPMonitorElectronMonitorBase):
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx
index 35615706ad7..630be41ac41 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitor.cxx
@@ -169,6 +169,7 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
       }
     
     ptype = bphys->particleType();
+
   }
 
   m_invBS = invMass;
@@ -244,11 +245,10 @@ HLT::ErrorCode TrigIDTPMonitor::hltExecute(const HLT::TriggerElement* inputTE, H
     float deltaPhi = roi1->phi() - roi2->phi();
     while (deltaPhi >= kPI) deltaPhi -= kTWOPI;
     while (deltaPhi < -kPI) deltaPhi += kTWOPI;
-
+    
     ATH_MSG_VERBOSE("Delta Phi between two muons:" << deltaPhi);
     ATH_MSG_VERBOSE("Delta Eta between two muons:" << deltaEta);
   }
-
   //retrieve Muon Containers
 
   const xAOD::MuonContainer *mc1;
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx
index aa533804c8c..e919c6ddb43 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**************************************************************************
@@ -933,7 +933,7 @@ HLT::ErrorCode TrigIDTPMonitorElectron::hltExecute(const HLT::TriggerElement* in
     }
     y++;
   }
-  if(m_FTFfound){
+  if(m_FTFfound==0){
     ATH_MSG_DEBUG("FTF:::1)COMBINED CRITERIA: This candidate was found to be INEFFICIENT");
   }
   if(m_FTFfound==1){
@@ -946,7 +946,7 @@ HLT::ErrorCode TrigIDTPMonitorElectron::hltExecute(const HLT::TriggerElement* in
   //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
 
   //END OF ALGORITHM
-  ATH_MSG_INFO( "Finishing TrigIDTPMonitorElectron" );
+  ATH_MSG_DEBUG( "Finishing TrigIDTPMonitorElectron" );
 
   return HLT::OK;
 }
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h
index 7607bb98324..c69dedb7673 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/TrigIDTPMonitorElectron.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 /**************************************************************************
diff --git a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/components/TrigIDTPMonitor_entries.cxx b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/components/TrigIDTPMonitor_entries.cxx
index 7f1f6df814e..2c2e3b4addb 100644
--- a/Trigger/TrigMonitoring/TrigIDTPMonitor/src/components/TrigIDTPMonitor_entries.cxx
+++ b/Trigger/TrigMonitoring/TrigIDTPMonitor/src/components/TrigIDTPMonitor_entries.cxx
@@ -1,7 +1,7 @@
 #include "../TrigIDTPMonitor.h"
 #include "../TrigIDTPMonitorElectron.h"
 
-
 DECLARE_COMPONENT( TrigIDTPMonitor )
 DECLARE_COMPONENT( TrigIDTPMonitorElectron )
 
+
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
index 8c70e88edd1..2b775eb6e35 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 def TrigIDtrkMonitoringTool():
 
@@ -68,26 +68,31 @@ def TrigIDtrkMonitoringTool():
 		# tidabase.OutputLevel = DEBUG
 		tidaegamma.UseHighestPT = True
 		tidaegamma.ntupleChainNames += [
-			"Offline",
-			"HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_IDTrig",
-			"HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_FTF"
-			]
-		#ToolSvc += tidaegamma;
-		list += [ tidaegamma ]
-
-
-
-		# Shifter instances 
-		tidaegammashift = TrigTestBase(name = "IDEgammaShifterTool",
-					       histoPathBase = "/Trigger/HLT")
-		tidaegammashift.AnalysisConfig = "Tier0"
-		tidaegammashift.SliceTag = "HLT/TRIDT/Egamma/Shifter"
-		tidaegammashift.UseHighestPT = True
-		# tidabase.OutputLevel = DEBUG
-		tidaegammashift.ntupleChainNames += [
-			"Offline",
-			"HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
-			"HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+                        "Offline",
+                        "HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+                        "HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e.*_gsf_idperf:GSFTrigTrackParticles"
+                        ]
+                ToolSvc += tidaegamma
+                list += [ "TrigTestBase/IDEgammaTool" ]
+
+
+
+                # Shifter instances 
+                tidaegammashift = TrigTestBase(name = "IDEgammaShifterTool",
+                                               histoPathBase = "/Trigger/HLT")
+                tidaegammashift.AnalysisConfig = "Tier0"
+                tidaegammashift.SliceTag = "HLT/TRIDT/Egamma/Shifter"
+                tidaegammashift.UseHighestPT = True
+                # tidabase.OutputLevel = DEBUG
+                tidaegammashift.ntupleChainNames += [
+                        "Offline",
+                        "HLT_e28_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e28_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+                        "HLT_e24_lhmedium_idperf_L1EM20VH:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e24_lhmedium_idperf_L1EM20VH:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+                        "HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
                         # HI chains - pPb running
                         "HLT_e15_lhloose_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
                         "HLT_e15_lhloose_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
@@ -111,14 +116,16 @@ def TrigIDtrkMonitoringTool():
 		# tidabase.OutputLevel = DEBUG
 		tidaegammapurity.Shifter = True
 		tidaegammapurity.ntupleChainNames += [
-			"Offline",
-		        "HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
-		        "HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+                        "Offline",
+                        "HLT_e28_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e28_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+                        "HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e26_lhtight_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
                         # HI chains 
-		        "HLT_e15_medium_ion_idperf_L1EM12:InDetTrigTrackingxAODCnv_Electron_FTF",
-		        "HLT_e15_medium_ion_idperf_L1EM12:InDetTrigTrackingxAODCnv_Electron_IDTrig",
-			"HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
-			"HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig"
+                        "HLT_e15_medium_ion_idperf_L1EM12:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e15_medium_ion_idperf_L1EM12:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+                        "HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
+                        "HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig"
 			]
 		#ToolSvc += tidaegammapurity;
 		list += [ tidaegammapurity ]
@@ -257,181 +264,215 @@ def TrigIDtrkMonitoringTool():
 		#ToolSvc += tidataupurity;
 		list += [ tidataupurity ]
 		
-
-
-
-		
-		##############################################################
+                
+                ##############################################################
                 # Bjet instances - check track collection names
-		##############################################################
+                ##############################################################
 
                 # Expert instances
-		tidabjet = TrigTestBase(name = "IDBjetTool",
-					histoPathBase = "/Trigger/HLT")
-		tidabjet.AnalysisConfig = "Tier0"
-		tidabjet.SliceTag = "HLT/TRIDT/Bjet/Expert"
-		tidabjet.ntupleChainNames += [
-			"Offline",
-			# jet based chains
-			"HLT_j55_bperf:InDetTrigTrackingxAODCnv_Bjet_FTF",
-			"HLT_j55_bperf:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
-			"HLT_j.*bperf_split:key=InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi",
-			"HLT_j.*bperf_split:key=InDetTrigTrackingxAODCnv_Bjet_IDTrig",
-			"HLT_j.*bperf_split:key=InDetTrigTrackingxAODCnv_Bjet_FTF",
-			"HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi",
-			"HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_IDTrig",
-			"HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_FTF"
-			]
-		#ToolSvc += tidabjet;
-		list += [ tidabjet ]
+                tidabjet = TrigTestBase(name = "IDBjetTool",
+                                        histoPathBase = "/Trigger/HLT")
+                tidabjet.AnalysisConfig = "Tier0"
+                tidabjet.SliceTag = "HLT/TRIDT/Bjet/Expert"
+                tidabjet.ntupleChainNames += [
+                        "Offline",
+                        # jet based chains
+                        "HLT_j55_bperf:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j55_bperf:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j55_bperf_split:key=InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:post:pt=5000",
+                        "HLT_j55_bperf_split:key=InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j55_bperf_split:key=InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:post:pt=5000",
+                        "HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_IDTrig"
+                        ]
+#                ToolSvc += tidabjet
+                list += [ "TrigTestBase/IDBjetTool" ]
 
 
                 # Shifter instances
-		tidabjetshift = TrigTestBase(name = "IDBjetShifterTool",
-					     histoPathBase = "/Trigger/HLT")
-		tidabjetshift.AnalysisConfig = "Tier0"
-		tidabjetshift.SliceTag = "HLT/TRIDT/Bjet/Shifter"
-		tidabjetshift.ntupleChainNames += [
-			"Offline",
-			"HLT_j45*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
-			"HLT_j45*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
-			"HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
-			"HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
-			"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
-			"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig"
-			]
-		#ToolSvc += tidabjetshift;
-		list += [ tidabjetshift ]
+                tidabjetshift = TrigTestBase(name = "IDBjetShifterTool",
+                                             histoPathBase = "/Trigger/HLT")
+                tidabjetshift.AnalysisConfig = "Tier0"
+                tidabjetshift.SliceTag = "HLT/TRIDT/Bjet/Shifter"
+                tidabjetshift.ntupleChainNames += [
+                        "Offline",
+                        "HLT_j45_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j45_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j35_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j35_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j55.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j55.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig"
+                        ]
+#                ToolSvc += tidabjetshift
+                list += [ "TrigTestBase/IDBjetShifterTool" ]
 
                 # Shifter Purity instances
-		tidabjetpurity = TrigTestBase(name = "IDBjetPurityerTool",
-					     histoPathBase = "/Trigger/HLT")
-		tidabjetpurity.AnalysisConfig = "Tier0"
-		tidabjetpurity.SliceTag = "HLT/TRIDT/BjetPurity/Expert"
-		tidabjetpurity.RunPurity = True
-		tidabjetpurity.ntupleChainNames += [
-			"Offline",
-			"HLT_j85_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
-			"HLT_j85_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig"
-			]
-		#ToolSvc += tidabjetpurity;
-		list += [ tidabjetpurity ]
+                tidabjetpurity = TrigTestBase(name = "IDBjetPurityerTool",
+                                             histoPathBase = "/Trigger/HLT")
+                tidabjetpurity.AnalysisConfig = "Tier0"
+                tidabjetpurity.SliceTag = "HLT/TRIDT/BjetPurity/Expert"
+                tidabjetpurity.RunPurity = True
+                tidabjetpurity.Shifter = True
+                tidabjetpurity.ntupleChainNames += [
+                        "Offline",
+                        "HLT_j45_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j45_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j225_gsc400_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j225_gsc400_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig",
+                        "HLT_j85_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
+                        "HLT_j85_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig"
+                        ]
+#                ToolSvc += tidabjetpurity
+                list += [ "TrigTestBase/IDBjetPurityTool" ]
 
 
                 # Shifter instances
-		tidabjetvtxshift = TrigTestBase(name = "IDBjetVtxShifterTool",
-					     histoPathBase = "/Trigger/HLT")
-		tidabjetvtxshift.AnalysisConfig = "Tier0"
-		tidabjetvtxshift.SliceTag = "HLT/TRIDT/BjetVtx/Shifter"
-		tidabjetvtxshift.ShifterChains = 2
-		tidabjetvtxshift.ntupleChainNames += [
-			"Offline",
-			"HLT_j45*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=xPrimVx",
-			"HLT_j45*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=EFHistoPrmVtx",
-			"HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=xPrimVx",
-			"HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=EFHistoPrmVtx",
-			"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=xPrimVx",
-			"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=EFHistoPrmVtx"
-			]
-		#ToolSvc += tidabjetvtxshift;
-		list += [ tidabjetvtxshift ]
-
-
-
-
-		##############################################################
-		# Bphys instances
-		##############################################################
-		
-		# Expert instances 
-		tidabphys = TrigTestBase(name = "IDBphysTool",
-					histoPathBase = "/Trigger/HLT")
-		tidabphys.AnalysisConfig = "Tier0"
-		tidabphys.SliceTag = "HLT/TRIDT/Bphys/Expert"
-		# tidabase.OutputLevel = DEBUG
-		tidabphys.ntupleChainNames += [
-			"Offline",
-			"HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_FTF",
-			"HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_IDTrig"
-#			"HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_EFID"
-#			"HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_EFID",
-#			"HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_IDTrig",
-#			"HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_FTF"
-			]
-		#ToolSvc += tidabphys;
-		list += [ tidabphys ]
-
-
-		# Shifter instances 
-		tidabphysshift = TrigTestBase(name = "IDBphysShifterTool",
-					histoPathBase = "/Trigger/HLT")
-		tidabphysshift.AnalysisConfig = "Tier0"
-		tidabphysshift.SliceTag = "HLT/TRIDT/Bphys/Shifter"
-		tidabphysshift.ntupleChainNames += [
-			"Offline",
-#			"HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_IDTrig",
-#			"HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_FTF"
-			"HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_FTF",
-			"HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_IDTrig"
-			]
-		#ToolSvc += tidabphysshift;
-		list += [ tidabphysshift ]
-
-
-
-
-		##############################################################
-		# minBias instances
-		##############################################################
-		
-		# Expert instances 
-		tidaminbias = TrigTestBase(name = "IDminBiasTool",
-					histoPathBase = "/Trigger/HLT")
-		tidaminbias.AnalysisConfig = "Tier0"
-		tidaminbias.SliceTag = "HLT/TRIDT/minBias/Expert"
-		# tidabase.OutputLevel = DEBUG
-		tidaminbias.ntupleChainNames += [
-			"Offline",
-			"HLT_mb_.*idperf.*:InDetTrigTrackingxAODCnv_minBias_EFID"
-			]
-		#ToolSvc += tidaminbias;
-		list += [ tidaminbias ]
+                tidabjetvtxshift = TrigTestBase(name = "IDBjetVtxShifterTool",
+                                             histoPathBase = "/Trigger/HLT")
+                tidabjetvtxshift.AnalysisConfig = "Tier0"
+                tidabjetvtxshift.SliceTag = "HLT/TRIDT/BjetVtx/Shifter"
+                tidabjetvtxshift.ShifterChains = 2
+                tidabjetvtxshift.ntupleChainNames += [
+                        "Offline",
+#                       "HLT_j225_gsc400_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+#                       "HLT_j225_gsc400_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j45_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j45_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j35_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j35_gsc55_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j55.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j55.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j5.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx"
+                        ]
+#                ToolSvc += tidabjetvtxshift
+                list += [ "TrigTestBase/IDBjetVtxShifterTool" ]
 
 
-		# Shifter instances 
-		tidaminbiasshift = TrigTestBase(name = "IDminBiasShifterTool",
-					histoPathBase = "/Trigger/HLT")
-		tidaminbiasshift.AnalysisConfig = "Tier0"
-		tidaminbiasshift.SliceTag = "HLT/TRIDT/minBias/Shifter"
-		tidaminbiasshift.ntupleChainNames += [
-			"Offline",
-			"HLT_mb_.*idperf.*:InDetTrigTrackingxAODCnv_minBias_EFID"
-			]
-		#ToolSvc += tidaminbiasshift;
-		list += [ tidaminbiasshift ]
+                # Shifter instances
+                tidajetvtxshift = TrigTestBase(name = "IDJetVtxShifterTool",
+                                             histoPathBase = "/Trigger/HLT")
+                tidajetvtxshift.AnalysisConfig = "Tier0"
+                tidajetvtxshift.SliceTag = "HLT/TRIDT/JetVtx/Shifter"
+                tidajetvtxshift.ShifterChains = 2
+                tidajetvtxshift.ntupleChainNames += [
+                        "Offline",
+                        "HLT_j85_gsc110_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j85_gsc110_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j225_gsc400_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j225_gsc400_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j225_gsc.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j225_gsc.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j50_gsc.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j50_gsc.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx",
+                        "HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=xPrimVx",
+                        "HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF:roi=SuperRoi:vtx=EFHistoPrmVtx"
+                        ]
+#                ToolSvc += tidajetvtxshift
+                list += [ "TrigTestBase/IDJetVtxShifterTool" ]
+
+
+
+
+                ##############################################################
+                # Bphys instances
+                ##############################################################
+                
+                # Expert instances 
+                tidabphys = TrigTestBase(name = "IDBphysTool",
+                                        histoPathBase = "/Trigger/HLT")
+                tidabphys.AnalysisConfig = "Tier0"
+                tidabphys.SliceTag = "HLT/TRIDT/Bphys/Expert"
+                # tidabase.OutputLevel = DEBUG
+                tidabphys.ntupleChainNames += [
+                        "Offline",
+                        "HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_FTF",
+                        "HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_IDTrig"
+#                       "HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_EFID"
+#                       "HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_EFID",
+#                       "HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_IDTrig",
+#                       "HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_FTF"
+                        ]
+#               don't schedule the Bphys monitoring ...
+#               ToolSvc += tidabphys
+#               list += [ "TrigTestBase/IDBphysTool" ]
+
+
+                # Shifter instances 
+                tidabphysshift = TrigTestBase(name = "IDBphysShifterTool",
+                                        histoPathBase = "/Trigger/HLT")
+                tidabphysshift.AnalysisConfig = "Tier0"
+                tidabphysshift.SliceTag = "HLT/TRIDT/Bphys/Shifter"
+                tidabphysshift.ntupleChainNames += [
+                        "Offline",
+#                       "HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_IDTrig",
+#                       "HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_FTF"
+                        "HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_FTF",
+                        "HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_IDTrig"
+                        ]
+#               don't schedule the Bphys monitoring ...
+#               ToolSvc += tidabphysshift
+#               list += [ "TrigTestBase/IDBphysShifterTool" ]
+
+
+
+
+                ##############################################################
+                # minBias instances
+                ##############################################################
+                
+                # Expert instances 
+                tidaminbias = TrigTestBase(name = "IDminBiasTool",
+                                        histoPathBase = "/Trigger/HLT")
+                tidaminbias.AnalysisConfig = "Tier0"
+                tidaminbias.SliceTag = "HLT/TRIDT/minBias/Expert"
+                # tidabase.OutputLevel = DEBUG
+                tidaminbias.ntupleChainNames += [
+                        "Offline",
+                        "HLT_mb_.*idperf.*:InDetTrigTrackingxAODCnv_minBias_EFID"
+                        ]
+#                ToolSvc += tidaminbias
+                list += [ "TrigTestBase/IDminBiasTool" ]
+
+
+                # Shifter instances 
+                tidaminbiasshift = TrigTestBase(name = "IDminBiasShifterTool",
+                                        histoPathBase = "/Trigger/HLT")
+                tidaminbiasshift.AnalysisConfig = "Tier0"
+                tidaminbiasshift.SliceTag = "HLT/TRIDT/minBias/Shifter"
+                tidaminbiasshift.ntupleChainNames += [
+                        "Offline",
+                        "HLT_mb_.*idperf.*:InDetTrigTrackingxAODCnv_minBias_EFID"
+                        ]
+#                ToolSvc += tidaminbiasshift
+                list += [ "TrigTestBase/IDminBiasShifterTool" ]
 
 
                 ################################################
-		# FTK monitoring              
+                # FTK monitoring              
                 ################################################
 
-		tidaftk = TrigTestBase(name = "IDFTKTool",
-				       histoPathBase = "/Trigger/HLT")
-		tidaftk.AnalysisConfig = "Tier0"
-		tidaftk.SliceTag = "HLT/TRIDT/FTK/Expert"
-		# tidabase.OutputLevel = DEBUG
-		tidaftk.ntupleChainNames += [
-			"Offline",
-			# full scan analysis
-                       ":key=FTK_TrackParticleContainer",
-                       ":key=FTK_TrackParticleContainerRefit",
-			#jets			
-			"HLT_j.*perf_.*FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit:roi=SplitJet",
-			"HLT_j.*perf_.*FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig:roi=SplitJet",
-			"HLT_j.*perf_.*FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK:roi=SplitJet",
-			"HLT_j.*perf_.*FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig:roi=SplitJet",
-			#taus
-			"HLT_tau.*idperf_.*FTK:key=InDetTrigTrackingxAODCnv_Tau_FTK",
+                tidaftk = TrigTestBase(name = "IDFTKTool",
+                                       histoPathBase = "/Trigger/HLT")
+                tidaftk.AnalysisConfig = "Tier0"
+                tidaftk.SliceTag = "HLT/TRIDT/FTK/Expert"
+                # tidabase.OutputLevel = DEBUG
+                tidaftk.ntupleChainNames += [
+                        "Offline",
+                        #jets                   
+                        "HLT_j.*perf_.*FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit:roi=SplitJet",
+                        "HLT_j.*perf_.*FTKRefit:key=InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig:roi=SplitJet",
+                        "HLT_j.*perf_.*FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK:roi=SplitJet",
+                        "HLT_j.*perf_.*FTK:key=InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig:roi=SplitJet",
+                        #taus
+                        "HLT_tau.*idperf_.*FTK:key=InDetTrigTrackingxAODCnv_Tau_FTK",
                         "HLT_tau.*idperf_.*FTK:key=InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig",
                         "HLT_tau.*FTKNoPrec:key=InDetTrigTrackingxAODCnv_Tau_FTK",
                         "HLT_tau.*FTKRefit:key=InDetTrigTrackingxAODCnv_Tau_FTKRefit",
@@ -443,7 +484,61 @@ def TrigIDtrkMonitoringTool():
                         "HLT_mu.*idperf_FTKRefit:key=InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig"
 			]
 		#ToolSvc += tidaftk;
-		list += [ tidaftk ]
+                list += [ "TrigTestBase/IDFTKTool" ]
+
+
+
+                ################################################
+                # FTK fullscan monitoring              
+                ################################################
+
+                tidaftkfs = TrigTestBase(name = "IDFTKFSTool",
+                                         histoPathBase = "/Trigger/HLT")
+                tidaftkfs.AnalysisConfig = "Tier0"
+                tidaftkfs.SliceTag = "HLT/TRIDT/FTK/Expert"
+                # tidabase.OutputLevel = DEBUG
+
+                tidaftkfs.pixHitsOffline    = 4
+                tidaftkfs.sctHitsOffline    = 6
+                tidaftkfs.blayerHitsOffline = 1
+                tidaftkfs.pixHolesOffline   = 1
+
+                tidaftkfs.ntupleChainNames += [
+                        "Offline",
+                        # full scan analysis
+                        ":key=FTK_TrackParticleContainer",
+                        ":key=FTK_TrackParticleContainerRefit"
+                        ]
+#                ToolSvc += tidaftkfs
+                list += [ "TrigTestBase/IDFTKFSTool" ]
+
+
+
+		# purity analysis
+
+                tidaftkfs_purity = TrigTestBase(name = "IDFTKFSPurityTool",
+                                         histoPathBase = "/Trigger/HLT")
+                tidaftkfs_purity.AnalysisConfig = "Tier0"
+                tidaftkfs_purity.SliceTag = "HLT/TRIDT/FTKPurity/Expert"
+                tidaftkfs_purity.RunPurity = True
+
+                tidaftkfs_purity.pTCutOffline      = 500
+
+                tidaftkfs_purity.pixHitsOffline    = -1
+                tidaftkfs_purity.sctHitsOffline    =  4
+#               tidaftkfs_purity.blayerHitsOffline = -1
+#               tidaftkfs_purity.pixHolesOffline   = 20
+		tidaftkfs_purity.siHitsOffline     = 6
+		tidaftkfs_purity.siHolesOffline    = 20
+
+                tidaftkfs_purity.ntupleChainNames += [
+                        "Offline",
+                        # full scan analysis
+                        ":key=FTK_TrackParticleContainer",
+                        ":key=FTK_TrackParticleContainerRefit"
+                        ]
+#                ToolSvc += tidaftkfs_purity
+                list += [ "TrigTestBase/IDFTKFSPurityTool" ]
 
 
-	return list
+        return list
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx
index db327e686f6..9b6a3bd591d 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/hanconfig.cxx
@@ -1,3 +1,6 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    hanconfig.cxx         
 //            navigates through the directory structure of a monitoring 
@@ -5,7 +8,6 @@
 //            
 //   @author M.Sutton
 // 
-//   Copyright (C) 2013 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: hanconfig.cxx, v0.0   Thu  12 March 2015 14:13:47 CEST sutt $
 
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/simpletimer.h b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/simpletimer.h
index 13be81e43d7..25c628c6495 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/simpletimer.h
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/utils/simpletimer.h
@@ -1,10 +1,12 @@
 // emacs: this is -*- c++ -*-
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    simpletimer.h        
 //            these functions have a precision of about 0.001 ms
 //
 //
-//   Copyright (C) 2007 M.Sutton (sutt@hep.ucl.ac.uk)    
 //
 //   $Id: simpletimer.h, v0.0   Thu 22 Jan 2009 15:51:52 GMT sutt $
 
diff --git a/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx b/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx
index c292674d43f..92b84b63934 100644
--- a/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx
+++ b/Trigger/TrigTools/IDScanHitFilter/src/FilterBin.cxx
@@ -1,10 +1,12 @@
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   @file    FilterBin.cxx         
 //            set static variables for the FilterBin class   
 //
 //   @author M.Sutton
 // 
-//   Copyright (C) 2013 M.Sutton (sutt@cern.ch)    
 //
 //   $Id: FilyterBin.cxx, v0.0   Sun 17 Mar 2013 10:06:51 GMT sutt $
 
diff --git a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h b/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
index 12701b0e809..9e812929b22 100755
--- a/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
+++ b/Trigger/TrigTools/IDScanZFinder/IDScanZFinder/TrigZFinderInternal.h
@@ -143,6 +143,12 @@ class TrigZFinderInternal
     double m_tripletDK;
     double m_tripletDP;
 
+    int    m_maxLayer;
+
+    double m_minVtxSignificance;
+    double m_percentile;
+
+
     /// to apply a hreshold to the found vertex candidates
 
     double  m_weightThreshold;
diff --git a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx
index de8e29322b5..628c80560e4 100755
--- a/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/IDScanZFinder.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -167,25 +167,20 @@ StatusCode IDScanZFinder::finalize() {
 
 TrigVertexCollection* IDScanZFinder::findZ( const std::vector<const TrigSiSpacePoint *>& spVec, const IRoiDescriptor& roi)
 {
-  MsgStream athenaLog( msgSvc(), name() );
 
   TrigVertexCollection* output = new TrigVertexCollection;
   //  int outputLevel = msgSvc()->outputLevel( name() );
 
   std::vector<vertex>* vertices = findZInternal( spVec, roi);
-  //athenaLog << MSG::INFO << "RoI: " << *RoI << endmsg;
-  //athenaLog << MSG::INFO << "RoI->phi0(): " << RoI->phi0() << endmsg;
-
 
-  athenaLog << MSG::DEBUG << "roi: "    << roi << endmsg;
-  athenaLog << MSG::DEBUG << "m_NumPhiSlices: " << m_NumPhiSlices << endmsg;
+  ATH_MSG_DEBUG("roi: "    << roi);
+  ATH_MSG_DEBUG("m_NumPhiSlices: " << m_NumPhiSlices);
  
 
   if ( GetInternalStatus()==-1 ) { 
-    //    athenaLog << MSG::ERROR << "phi of spacepoint out of range!" << endmsg;
-    //    athenaLog << MSG::ERROR << "Exiting ZFinder..." << endmsg;
-    athenaLog << MSG::WARNING << "phi of spacepoint out of range! phi=" << GetReturnValue() << endmsg;
-    athenaLog << MSG::WARNING << "Exiting ZFinder..." << endmsg;
+    ATH_MSG_WARNING("phi of spacepoint out of range! phi=" << GetReturnValue());
+    ATH_MSG_WARNING("Exiting ZFinder...");
+
   }
 
   for ( unsigned int i=0 ; i<vertices->size() ; i++ ) { 
diff --git a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx
index d2d7a323c3c..c30c83d990b 100755
--- a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinder.cxx
@@ -1,7 +1,6 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
-
 ////////////////////////////////////////////////////////////////////////////////
 // IdScan: TrigZFinder
 // ( see header-file for details )
@@ -56,6 +55,10 @@ TrigZFinder::TrigZFinder( const std::string& type, const std::string& name, cons
   declareProperty( "TripletDK",          m_tripletDK        = 0.005 );
   declareProperty( "TripletDP",          m_tripletDP        = 0.05  );
   declareProperty( "WeightThreshold",    m_weightThreshold  = 0     );
+  declareProperty( "MaxLayer",           m_maxLayer        = 32    );
+  declareProperty( "MinVtxSignificance", m_minVtxSignificance  = 0  );
+  declareProperty( "Percentile",         m_percentile          = 1  );
+
 
   declareProperty( "LayerNumberTool", m_numberingTool);
 
@@ -154,6 +157,14 @@ StatusCode TrigZFinder::initialize()
 
   athenaLog << MSG::INFO << "TrigZFinder::m_tripletMode      = " << m_tripletMode      << endmsg;
 
+  athenaLog << MSG::INFO << "TrigZFinder::m_maxLayer         = " << m_maxLayer        << endmsg;
+
+  athenaLog << MSG::INFO << "TrigZFinder::m_minVtxSignificance = " << m_minVtxSignificance  << endmsg;
+
+  if ( m_minVtxSignificance>0 ) { 
+    athenaLog << MSG::INFO << "TrigZFinder::m_percentile     = " << m_percentile  << endmsg;
+  }
+
   athenaLog << MSG::INFO << "TrigZFinder::m_weigthThreshold  = " << m_weightThreshold  << endmsg;
 
   return sc;
@@ -166,25 +177,18 @@ StatusCode TrigZFinder::finalize() {
 
 TrigVertexCollection* TrigZFinder::findZ( const std::vector<TrigSiSpacePointBase>& spVec, const IRoiDescriptor& roi)
 {
-  MsgStream athenaLog( msgSvc(), name() );
 
   TrigVertexCollection* output = new TrigVertexCollection;
-  //  int outputLevel = msgSvc()->outputLevel( name() );
 
   std::vector<vertex>* vertices = findZInternal( spVec, roi);
-  //athenaLog << MSG::INFO << "RoI: " << *RoI << endmsg;
-  //athenaLog << MSG::INFO << "RoI->phi0(): " << RoI->phi0() << endmsg;
-
 
-  athenaLog << MSG::DEBUG << "roi: "    << roi << endmsg;
-  athenaLog << MSG::DEBUG << "m_NumPhiSlices: " << m_NumPhiSlices << endmsg;
+  ATH_MSG_DEBUG("roi: "    << roi);
+  ATH_MSG_DEBUG("m_NumPhiSlices: " << m_NumPhiSlices);
  
 
   if ( GetInternalStatus()==-1 ) { 
-    //    athenaLog << MSG::ERROR << "phi of spacepoint out of range!" << endmsg;
-    //    athenaLog << MSG::ERROR << "Exiting ZFinder..." << endmsg;
-    athenaLog << MSG::WARNING << "phi of spacepoint out of range! phi=" << GetReturnValue() << endmsg;
-    athenaLog << MSG::WARNING << "Exiting ZFinder..." << endmsg;
+    ATH_MSG_WARNING("phi of spacepoint out of range! phi=" << GetReturnValue());
+    ATH_MSG_WARNING("Exiting ZFinder...");
   }
 
   for ( unsigned int i=0 ; i<vertices->size() ; i++ ) { 
diff --git a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
index 365aaeda74e..f6940f2b3cb 100644
--- a/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
+++ b/Trigger/TrigTools/IDScanZFinder/src/TrigZFinderInternal.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "IDScanZFinder/TrigZFinderInternal.h"
@@ -10,8 +10,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 
-TrigZFinderInternal::TrigZFinderInternal( const std::string& type, 
-    const std::string& name)  
+TrigZFinderInternal::TrigZFinderInternal( const std::string& type, const std::string& name)  
 {
   m_type = type;
   m_name = name;
@@ -40,6 +39,11 @@ TrigZFinderInternal::TrigZFinderInternal( const std::string& type,
   m_tripletDK        = 0.005 ;  
   m_tripletDP        = 0.05  ;
 
+  m_maxLayer         = 32;
+
+  m_minVtxSignificance = 0;
+  m_percentile         = 1;
+  
   //  m_applyWeightThreshold = false;
   m_weightThreshold      = 0;
 
@@ -309,6 +313,7 @@ long TrigZFinderInternal::fillVectors (const std::vector<TrigSiSpacePointBase>&
     /// DOES NOT span the phi=pi boundary
     for(long i=0; i<nSPs; ++i, ++SpItr) 
     {
+      if ( SpItr->layer()>m_maxLayer ) continue;
       double phi2 = SpItr->phi() - roiPhiMin;
 
       if ( phi2>=0 && phi2<dphi ) { 
@@ -326,9 +331,10 @@ long TrigZFinderInternal::fillVectors (const std::vector<TrigSiSpacePointBase>&
     /// DOES span the phi=pi boundary
     for(long i=0; i<nSPs; ++i, ++SpItr) 
     {
+
       double phi2 = SpItr->phi() - roiPhiMin;
       if( phi2<0.0) phi2+=2*M_PI;
-
+      if ( SpItr->layer()>m_maxLayer ) continue;
       if ( phi2>=0 && phi2<dphi ) { 
         phi[i] = phi2;
         rho[i] = SpItr->r();
@@ -475,52 +481,48 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
       nHisto[0][sliceIndex].resize( NumZhistoBins + 1 );
       zHisto[0][sliceIndex].resize( NumZhistoBins + 1 );
     }
-    if ( m_chargeAware )
-    {
-      for ( unsigned int sliceIndex = 0; sliceIndex < m_NumPhiSlices; sliceIndex++ )
-      {
-        nHisto[1][sliceIndex].resize( NumZhistoBins + 1 );
-        zHisto[1][sliceIndex].resize( NumZhistoBins + 1 );
+    if ( m_chargeAware ) {
+      for ( unsigned int sliceIndex = 0; sliceIndex < m_NumPhiSlices; sliceIndex++ ) {
+	  nHisto[1][sliceIndex].resize( NumZhistoBins + 1 );
+	  zHisto[1][sliceIndex].resize( NumZhistoBins + 1 );
       }
     }
-
+    
     //Populate the histograms
-    for ( unsigned int sliceIndex = 0; sliceIndex < m_NumPhiSlices; sliceIndex++ )
-    {
+    for ( unsigned int sliceIndex = 0; sliceIndex < m_NumPhiSlices; sliceIndex++ )  {
       allSlices[ sliceIndex ]->GetHistogram( &( nHisto[0][sliceIndex] ), &( zHisto[0][sliceIndex] ),
           &( nHisto[1][sliceIndex] ), &( zHisto[1][sliceIndex] ),
           m_extraPhi, extraPhiNeg, m_nFirstLayers, m_tripletMode, m_chargeAware, nHisto, zHisto );
+
       //Note the extra arguments here - pointers to the whole histogram collection
       //This allows the filling of neighbouring slice histograms as required, but breaks thread safety
-
+      
       delete allSlices[ sliceIndex ];
     }
   }
-  else
-  {
+  else {
     //Allocate the z-axis histograms
     nHisto[0][0].resize( NumZhistoBins + 1 );
     zHisto[0][0].resize( NumZhistoBins + 1 );
-    if ( m_chargeAware )
-    {
+    if ( m_chargeAware )  {
       nHisto[1][0].resize( NumZhistoBins + 1 );
       zHisto[1][0].resize( NumZhistoBins + 1 );
     }
-
+    
     //Populate the histogram - fast and memory-efficient, but not thread safe (use MakeHistogram for thread safety)
-    for ( unsigned int sliceIndex = 0; sliceIndex < m_NumPhiSlices; sliceIndex++ )
-    {
+    for ( unsigned int sliceIndex = 0; sliceIndex < m_NumPhiSlices; sliceIndex++ ) {
       allSlices[ sliceIndex ]->GetHistogram( &( nHisto[0][0] ), &( zHisto[0][0] ),
           &( nHisto[1][0] ), &( zHisto[1][0] ),
           m_extraPhi, extraPhiNeg, m_nFirstLayers, m_tripletMode, m_chargeAware );
+
       delete allSlices[ sliceIndex ];
     }
   }
+  
 
 
-
-  /// First calculate the pedestal to be subtracted (only used in the HI 
-  /// case at the moment)
+  /// First calculate the pedestal to be subtracted 
+  /// (only used in the HI case at the moment)
 
   double pedestal = 0;
 
@@ -546,10 +548,39 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
     }
 
     if ( count>0 ) pedestal /= count;
-
+    
   }
 
 
+  /// calculate the vertex significance: 
+  /// First sort the n entries in each bin in to order, then 
+  /// calculate the mean bg excluding the largest (1-m_percentile), 
+  /// then the significance for each peak will be 
+  ///    sig = (ypeak - bg)/sqrt(bg)
+  /// and we can keep only those where sig > m_minVtxSignificance
+
+  double bg = 0; 
+      
+  if ( m_minVtxSignificance > 0 ) { 
+
+    if ( !m_chargeAware ) {  
+
+      std::vector<long>& n = nHisto[0][0];
+      
+      std::vector<long>  n3( nHisto[0][0].size()-2, 0);
+      
+      for( unsigned i=n.size()-2 ; i-- ;  ) n3[i] = ( n[i+2] + n[i+2] + n[i] );
+      std::sort( n3.begin(), n3.end() );
+      
+      unsigned nmax = unsigned(n3.size()*m_percentile);
+
+      for( unsigned i=nmax ; i-- ;  ) bg += n3[i];
+      
+      if ( nmax>0 ) bg /= nmax;
+      
+    }
+  }
+
 
 
   //   Now the nHisto's are filled; find the 3 consecutive bins with the highest number of entries...
@@ -604,9 +635,9 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
         //   ...and compute the "entries-weighted" average bin position
 
         double weightedMax = ( zHisto[bending][bestPhi][binMax] +
-            zHisto[bending][bestPhi][binMax+1] +
-            zHisto[bending][bestPhi][binMax-1] ) /maxh;
-
+			       zHisto[bending][bestPhi][binMax+1] +
+			       zHisto[bending][bestPhi][binMax-1] ) /maxh;
+	
         /// if found a vertex flag the bins so we don't use them again 
         if ( m_numberOfPeaks>1 ) { 
           nHisto[bending][bestPhi][binMax]   = -1;
@@ -619,20 +650,33 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
 
         int closestVtx = -1; // find the closest vertex already put into the output list
         float dist2closestVtx = 1000; // should be larger than m_ZFinder_MaxZ*2
-        for ( size_t iv = 0; iv < zoutput.size(); ++iv )
+        for ( size_t iv = 0; iv < zoutput.size(); ++iv ) {
           if ( fabs(weightedMax-zoutput[iv]) < dist2closestVtx ) {
             closestVtx = iv;
             dist2closestVtx = fabs(weightedMax-zoutput[iv]); 
           }
+	}
 
-        if ( dist2closestVtx < m_nvrtxSeparation * ZBinSize ||
-            dist2closestVtx < fabs(weightedMax) * m_vrtxDistCut ) {
+        if ( dist2closestVtx < m_nvrtxSeparation*ZBinSize || dist2closestVtx < fabs(weightedMax)*m_vrtxDistCut ) {
           zoutput[closestVtx] = m_vrtxMixing * weightedMax + (1.0 - m_vrtxMixing) * zoutput[closestVtx] ;
           woutput[closestVtx] = m_vrtxMixing * maxh        + (1.0 - m_vrtxMixing) * woutput[closestVtx] ;
-        }  else  {
-          zoutput.push_back( weightedMax );
-          woutput.push_back( maxh );
-        }
+        }  
+	else  {
+
+	  /// here we reject those vertex candidates 
+	  /// where significance < m_minVtxSignificance
+	  bool addvtx = true;
+	  double significance = 0;
+	  if ( bg>0 ) { 
+	    significance = (maxh-bg)/std::sqrt(bg);
+	    if ( significance < m_minVtxSignificance ) addvtx = false;
+	  }
+
+	  if ( addvtx ) { 
+	    zoutput.push_back( weightedMax );
+	    woutput.push_back( maxh );
+	  }
+	}
 
       } // end of "b" loop, the loop over m_numberOfPeaks
 
@@ -655,7 +699,7 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
 
 
       /// NB: if m_weightThreshold==0 then pedestal == 0 also   
-      /// AAAAAAAAARRRGHH!!! This is ridiculous, passing parameters about differently because we don't have a 
+      /// This is ridiculous, passing parameters about differently because we don't have a 
       /// proper interface defined 
       if ( m_weightThreshold>0 ) { 
         for ( unsigned i=0 ; i<zoutput.size() ; i++ ) { 
@@ -672,5 +716,5 @@ std::vector<typename TrigZFinderInternal::vertex>* TrigZFinderInternal::findZInt
       //  for ( unsigned i=0 ; i<zoutput.size() ; i++ ) std::cout << "SUTT zoutput        " << i << "\t" << zoutput[i] << std::endl;
 
       return output;
-    }
+}
 
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt b/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
index 3b362edcec9..ff714d3ed6f 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/CMakeLists.txt
@@ -47,6 +47,7 @@ atlas_add_component( TrigOnlineSpacePointTool
                      INCLUDE_DIRS ${TDAQ-COMMON_INCLUDE_DIRS}
                      LINK_LIBRARIES ${TDAQ-COMMON_LIBRARIES} AthenaBaseComps IRegionSelector InDetByteStreamErrors ByteStreamData ByteStreamData_test GaudiKernel InDetByteStreamErrors InDetIdentifier InDetReadoutGeometry SCT_CablingLib InDetRawData InDetPrepRawData SiClusterizationToolLib TrkPrepRawData TrigInDetEvent TrigSteeringEvent AtlasDetDescr ByteStreamCnvSvcBaseLib SCT_ConditionsData TrkSpacePoint TrigTimeAlgsLib PixelCablingLib )
 
+
 # Install files from the package:
 atlas_install_headers( TrigOnlineSpacePointTool )
 atlas_install_python_modules( python/*.py )
diff --git a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
index 0d656816194..3497c279de2 100644
--- a/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
+++ b/Trigger/TrigTools/TrigOnlineSpacePointTool/src/TrigSpacePointConversionTool.cxx
@@ -74,6 +74,9 @@ StatusCode TrigSpacePointConversionTool::initialize() {
   ATH_CHECK(m_pixelSpacePointsContainerKey.initialize());
   ATH_CHECK(m_sctSpacePointsContainerKey.initialize());
 
+  ATH_CHECK(m_pixelSpacePointsContainerKey.initialize());
+  ATH_CHECK(m_sctSpacePointsContainerKey.initialize());
+
   ATH_MSG_INFO("TrigSpacePointConversionTool initialized ");
 
   return sc;
diff --git a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile
index 5daacf40311..499fbbeb926 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile
+++ b/Trigger/TrigValidation/TrigInDetValidation/TIDAbuild/makefile
@@ -2,7 +2,6 @@
 #
 #   File:         makefile
 #
-#                 Copyright (C) M.Sutton (sutt@cern.ch) 
 #   Description:  simply builds a global xml file from a collection of 
 #                 separate xml files  
 #                 
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Chains.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Chains.py
index 22fc1d625e9..60dac4312ae 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Chains.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Chains.py
@@ -6,11 +6,16 @@ def electronChains(doIDNewTracking):
   if doIDNewTracking:
     tidaAnalysischains += ["Offline"]
 
-  idTrigChainlist.append(  ['e24_medium_idperf', 'L1_EM20VH', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'],1])
-  idTrigChainlist.append(   ['e5_loose_idperf', 'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'],1])
+  idTrigChainlist.append(  ['e24_medium_idperf',     'L1_EM20VH', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'],1])
+  idTrigChainlist.append(  ['e28_medium_idperf',     'L1_EM24VHI', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'],1])
+  idTrigChainlist.append(  ['e28_medium_gsf_idperf', 'L1_EM24VHI', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'],1])
+  idTrigChainlist.append(  ['e5_loose_idperf', 'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'],1])
   tidaAnalysischains.append('HLT_e24_medium_idperf:TrigFastTrackFinder_eGamma')
   tidaAnalysischains.append('HLT_e24_medium_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig')
   tidaAnalysischains.append('HLT_e24_medium_idperf:InDetTrigTrackingxAODCnv_Electron_FTF')
+  tidaAnalysischains.append('HLT_e24_medium_idperf:InDetTrigTrackingxAODCnv_Electron_FTF')
+  tidaAnalysischains.append('HLT_e28_medium_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig')
+  tidaAnalysischains.append('HLT_e28_medium_gsf_idperf:GSFTrigTrackParticles')  
   tidaAnalysischains.append('HLT_e5_loose_idperf:TrigFastTrackFinder_eGamma')
   tidaAnalysischains.append('HLT_e5_loose_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig')
   tidaAnalysischains.append('HLT_e5_loose_idperf:InDetTrigTrackingxAODCnv_Electron_FTF')
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_AllSlices.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_AllSlices.py
index 7300e95a837..eb0e4e6b008 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_AllSlices.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_AllSlices.py
@@ -13,7 +13,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #if athenaCommonFlags.FilesInput()==[]:
 #  athenaCommonFlags.FilesInput=[
-#    "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
 #  ]
 
 
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
index 7057ddf8a73..cc62ddab8cb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BeamspotSlice.py
@@ -15,7 +15,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #if athenaCommonFlags.FilesInput()==[]:
 #  athenaCommonFlags.FilesInput=[
-#    "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
 #    ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
@@ -44,12 +44,8 @@ include("TrigInDetValidation/TrigInDetValidation_RTT_Common.py")
 topSequence.TrigSteer_HLT.terminateAlgo.Prescale=1.
 
 if 'fastZFinder' in dir() and fastZFinder==True:
-  FTF = topSequence.TrigSteer_HLT.TrigFastTrackFinder_BeamSpot_IDTrig
-
-  # set fast ZFinder settings here
-  # from AthenaCommon.ConfigurableDb import getConfigurable
-  # zfinder = getConfigurable("TrigZFinder")
-  zfinder = FTF.trigZFinder
+  from AthenaCommon.AppMgr import ToolSvc
+  zfinder = ToolSvc.TrigZFinder
 
   zfinder.NumberOfPeaks = 4
   zfinder.TripletMode = 1
@@ -59,6 +55,5 @@ if 'fastZFinder' in dir() and fastZFinder==True:
   zfinder.MinVtxSignificance = 10
   zfinder.Percentile = 0.95
 
+  print 'zfinder settings modified by TrigInDetValidation_RTT_topOptions_BeamspotSlice.py'
   print zfinder
-
-
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py
index 3b483dfd543..2bb4dc76dc1 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_BjetSlice.py
@@ -15,7 +15,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #if athenaCommonFlags.FilesInput()==[]:
 #  athenaCommonFlags.FilesInput=[
-#    "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.RDO.e3698_s2608_s2183_r7193/RDO.06752771._000001.pool.root.1",
 #    ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_ElectronSlice.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
index 81b7dabb4ec..9d0e27aec81 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_ElectronSlice.py
@@ -14,7 +14,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #if athenaCommonFlags.FilesInput()==[]:
 #  athenaCommonFlags.FilesInput=[
-#    "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361106.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zee.recon.RDO.e3601_s2665_s2183_r7191/RDO.06753544._000001.pool.root.1"
 #    ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MonitorSlice.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MonitorSlice.py
index 4a890c7227a..0a75795eccd 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MonitorSlice.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MonitorSlice.py
@@ -12,7 +12,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #if athenaCommonFlags.FilesInput()==[]:
 #  athenaCommonFlags.FilesInput=[
-#       "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361036.Pythia8_A2MSTW2008LO_minbias_inelastic.recon.RDO.e3580_s2726_r7011/RDO.07344311._000057.pool.root.1"
+#       "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361036.Pythia8_A2MSTW2008LO_minbias_inelastic.recon.RDO.e3580_s2726_r7011/RDO.07344311._000057.pool.root.1"
 #       ]
 
 from TriggerMenu import useNewTriggerMenu
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MuonSlice.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MuonSlice.py
index 7c49699d40e..0fa8fbf011b 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MuonSlice.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_MuonSlice.py
@@ -14,7 +14,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #if athenaCommonFlags.FilesInput()==[]:
 #  athenaCommonFlags.FilesInput=[
-#      "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"
+#      "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.recon.RDO.e3601_s2576_s2132_r7143/RDO.06718162._000013.pool.root.1"
 #    ]
 
 ###XMLDataSet='TrigInDetValidation_mu_single_mu_100' # <-- RTT jobID
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_TauSlice.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_TauSlice.py
index fb22cbcb87c..14d6cce7724 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_TauSlice.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_TauSlice.py
@@ -8,7 +8,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 
 #if athenaCommonFlags.FilesInput()==[]:
 #  athenaCommonFlags.FilesInput=[
-#    "root://eosatlas.cern.ch//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._001556.pool.root.1"    
+#    "root://eosatlas//eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc15_13TeV.361108.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Ztautau.recon.RDO.e3601_s2757_r7245/RDO.06885566._001556.pool.root.1"    
 #       ]
 
 include("TrigInDetValidation/TrigInDetValidation_RTT_Chains.py")
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh
index 013b258c580..cee8265c5eb 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_nodoublet.sh
@@ -142,6 +142,8 @@ function waitonallproc   {
 
 # run athena  
 
+iathena=0
+
 function runathena { 
    timestamp  "runathena:"
 
@@ -161,7 +163,10 @@ function runathena {
      echo "ARGS: $ARGS"
      echo -e "\nrunning athena in athena-$1\n"
      athena.py  -c "$ARGS"              TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py  &> athena-local-$1.log
-     echo "art-result: $? athena_$1"
+
+     echo "art-result: $? athena_$iathena"
+
+     ((iathena++))
 
      pwd
      ls -lt
diff --git a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh
index 0966198b3da..8fb21e737dd 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh
+++ b/Trigger/TrigValidation/TrigInDetValidation/test/test_trigindetvalidation_tau_ibl_pu46_roiparam.sh
@@ -142,6 +142,8 @@ function waitonallproc   {
 
 # run athena  
 
+iathena=0
+
 function runathena { 
    timestamp  "runathena:"
 
@@ -161,7 +163,10 @@ function runathena {
      echo "ARGS: $ARGS"
      echo -e "\nrunning athena in athena-$1\n"
      athena.py  -c "$ARGS"              TrigInDetValidation/TrigInDetValidation_RTT_topOptions_TauSlice.py  &> athena-local-$1.log
-     echo "art-result: $? athena_$1"
+
+     echo "art-result: $? athena_$iathena"
+
+     ((iathena++))
 
      pwd
      ls -lt
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs b/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs
index be4c79ce9e8..679bb8ef9c4 100755
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs
+++ b/Trigger/TrigValidation/TrigInDetValidation/utils/mkargs
@@ -88,7 +88,6 @@ for xmlfile in $FILES; do
     echo "#\!/bin/sh" > $outfile
     chmod u+x $outfile
 
-
     # get all the exerunner stages
 
     grep "<argvalue>" /tmp/$_file.xml |  $SED 's|<argvalue>||g' | $SED 's|</argvalue>||g' | grep -v check_log.pl > /tmp/_args
@@ -169,6 +168,16 @@ for xmlfile in $FILES; do
 #                    echo "   getting file $ffile"
                      if [ "$command" != "TIDArun.sh" -a "$command" != "TIDArun" ]; then
                         $(echo $ffile | grep -q "\*") || echo "get_files -data $ffile" >> $outfile
+                        if [ "$ext" == "dat" ]; then 
+			    get_files -data $ffile
+                            for DATFILE in $(grep "^# *include" $ffile | sed 's|.*include ||g' | sed 's|\"||g' ); do 
+                                echo "get_files -data $DATFILE" >> $outfile
+   			        get_files -data $DATFILE
+                                for EXTRAFILE in $(grep "^# *include" $DATFILE | sed 's|.*include ||g' | sed 's|\"||g' ); do 
+                                   echo "get_files -data $EXTRAFILE" >> $outfile
+                                done
+                            done
+			fi
                      fi
                   fi
                done
diff --git a/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx b/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx
index c7ef1cc6ab2..3d69d18368a 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx
+++ b/Trigger/TrigValidation/TrigInDetValidation/utils/selectblock/selectblock.cxx
@@ -1,10 +1,6 @@
-//
-//   @file    selectblock.cxx         
-//   
-//
-//   @author M.Sutton
-// 
-//   Copyright (C) 2017 M.Sutton (sutt@cern.ch)    
+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
 //
 //   $Id: selectblock.cxx, v0.0   Mon 23 Jan 2017 12:30:25 CET sutt $
 
diff --git a/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile b/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile
index 92e0fadf847..fd0c133a865 100644
--- a/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile
+++ b/Trigger/TrigValidation/TrigInDetValidationLight/TIDAbuild/makefile
@@ -2,7 +2,7 @@
 #
 #   File:         makefile
 #
-#                 Copyright (C) M.Sutton (sutt@cern.ch) 
+#                  
 #   Description:  simply builds a global xml file from a collection of 
 #                 separate xml files  
 #                 
-- 
GitLab