diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrigObjectMatcher.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrigObjectMatcher.h
new file mode 100644
index 0000000000000000000000000000000000000000..98cd9106b36db4654662903daf94f36e690a6c29
--- /dev/null
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrigObjectMatcher.h
@@ -0,0 +1,111 @@
+// emacs: this is -*- c++ -*-
+//
+//   @file    TrigObjectMatcher.h        
+//                    
+//
+//   $Id: TrigObjectMatcher.h, v0.0   Fri 14 Sep 2018 15:55:41 CEST sutt $
+//
+//   Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+
+#ifndef  TRIGOBJECTMATCHER_H
+#define  TRIGOBJECTMATCHER_H
+
+#include <iostream>
+#include <map>
+
+#include "TrigInDetAnalysis/Track.h"
+#include "TrigInDetAnalysis/TrackSelector.h"
+#include "TrigInDetAnalysis/TrackTrigObject.h"
+
+
+class TrigObjectMatcher {
+
+public:
+
+  typedef std::map<unsigned long, const TrackTrigObject*> map_type;
+
+public:
+
+  TrigObjectMatcher() : m_status(0) { } 
+
+  TrigObjectMatcher(  const std::vector<TIDA::Track*>&      tracks, 
+		      const std::vector<TrackTrigObject>& objects  ) 
+    : m_status(1) {         
+    for ( int i=tracks.size() ; i-- ; ) match( tracks[i]->id(), objects );
+  } 
+
+
+  TrigObjectMatcher(  TrackSelector* selector, 
+		      const std::vector<TrackTrigObject>& objects, 
+		      bool (*select_function)(const TrackTrigObject& t)=0 ) 
+    : m_status(1) {         
+    const std::vector<TIDA::Track*> tracks = selector->tracks();
+    for ( int i=tracks.size() ; i-- ; ) if ( match( tracks[i]->id(), objects, select_function )==false ) selector->delete_track( tracks[i] );
+  } 
+
+
+  virtual ~TrigObjectMatcher() { } 
+
+
+  const TrackTrigObject* object( unsigned long track_id) {
+    map_type::const_iterator itr = m_objectmap.find( track_id );
+    if ( itr==m_objectmap.end() ) return 0;
+    return itr->second;
+  } 
+
+  bool status() const { return m_status; }
+
+  map_type::const_iterator  begin() const { return m_objectmap.begin(); } 
+  map_type::const_iterator  end()   const { return m_objectmap.end(); } 
+
+  size_t size() const { return m_objectmap.size(); }   
+
+  void print( std::ostream& s ) const { 
+    s << "TrigObjectMatch size: " << m_objectmap.size();
+    for ( map_type::const_iterator itr = m_objectmap.begin() ; itr!=m_objectmap.end() ; itr++ ) { 
+      s << "\n[ id: 0x" << std::hex << itr->first << std::dec << "  ::  " << *(itr->second) << " ]";
+    }
+  }
+
+private:
+
+  bool  match( unsigned long track_id, const std::vector<TrackTrigObject>& objects, bool (*select_function)(const TrackTrigObject& t)=0 ) { 
+    for ( int j=objects.size() ; j-- ; ) { 
+      for ( int k=objects[j].children().size() ; k-- ; ) {
+	if ( track_id == objects[j].children()[k] ) {
+	  if ( select_function==0 || select_function(objects[j]) ) { 
+	    m_objectmap.insert( map_type::value_type( track_id, &objects[j] ) );
+	    return true;
+	  }
+	  else return false;
+	}
+      } 
+    }
+    return false;
+  } 
+
+
+private:
+  
+  int      m_status;
+  map_type m_objectmap;
+
+};
+
+inline std::ostream& operator<<( std::ostream& s, const TrigObjectMatcher& o ) { 
+  o.print( s );
+  return s;
+}
+
+
+#endif  // TRIGOBJECTMATCHER_H 
+
+
+
+
+
+
+
+
+
+
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx
index 6d35457ba0f127b979ae0d3bcadeea5c135bd745..9613b49eaa406f85dabb0eab541b2a43e5c3f251 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    AtlasLabels.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: AtlasLabels.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 68ddc49a4e24b20874ad46852ab76f52d7990bd0..e502e553582b3346393be35ecccb6f74bde3a8ce 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasLabels.h
@@ -1,17 +1,15 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    AtlasLabels.h         
 //   
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: AtlasLabels.h, v0.0   Thu 25 Mar 2010 10:34:20 CET $
 
 
-#ifndef __ATLASLABELS_H
-#define __ATLASLABELS_H
+#ifndef ANALYSIS_ATLASLABELS_H
+#define ANALYSIS_ATLASLABELS_H
 
 #include "Rtypes.h"
 
@@ -23,4 +21,4 @@ void ATLASLabelOld(Double_t x,Double_t y,bool Preliminary=false,Color_t color=1)
 
 void ATLASVersion( const std::string& version="", Double_t x=0.88, Double_t y=0.975, Color_t color=1 ); 
 
-#endif // __ATLASLABELS_H
+#endif // ANALYSIS_ATLASLABELS_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx
index 3c79c1d35d8a1241bea43ba4d9623f74af75590b..acc91f6e0c2919a85ea9f51785a56363f7e0c310 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    AtlasStyle.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: AtlasStyle.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 11f7e8954cc58190188d443a76df49bd0b804855..0ddcc837691cf7ffc977448bc6a272743f0ebfd2 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasStyle.h
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    AtlasStyle.h         
 //   
@@ -9,11 +6,12 @@
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: AtlasStyle.h, v0.0   Thu 25 Mar 2010 10:34:20 CET $
 
-#ifndef  __ATLASSTYLE_H
-#define __ATLASSTYLE_H
+#ifndef  ANALYSIS_ATLASSTYLE_H
+#define ANALYSIS_ATLASSTYLE_H
 
 #include "TStyle.h"
 
@@ -21,4 +19,4 @@ void SetAtlasStyle();
 
 TStyle* AtlasStyle(); 
 
-#endif // __ATLASSTYLE_H
+#endif // ANALYSIS_ATLASSTYLE_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h
index f868c85ea1a9cd1de65af2b0784ce10347fb39b2..144006cf8713e0ebae3371676e7ccd2e6104f75e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/AtlasUtils.h
@@ -1,9 +1,15 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+// emacs: this is -*- c++ -*-
+//
+//   @file    AtlasUtils.h        
+//                    
+//
+//   $Id: AtlasUtils.h, v0.0   Fri 11 Jan 2019 07:06:38 CET sutt $
+//
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
-#ifndef __ATLASUTILS_H
-#define __ATLASUTILS_H
+
+#ifndef ANALYSIS_ATLASUTILS_H
+#define ANALYSIS_ATLASUTILS_H
 
 #include <stdio.h>
 #include <cmath>
@@ -338,4 +344,4 @@ inline void myMarkerText(Double_t x,Double_t y,Int_t color,Int_t mstyle,char *te
   l.DrawLatex(x,y,text);
 }
 
-#endif // __ATLASUTILS_H
+#endif // ANALYSIS_ATLASUTILS_H
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h
index 837b768d7996447539def0b3cbfa7bd56a52298b..ac0c3c7b69807e24d2eaa11175062bd5f3aee24c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/BinConfig.h
@@ -1,12 +1,10 @@
 // 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) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 64690011c53054b96750bc8a7f7d513fcd88820e..7dc77d5f596234ed217cdaf23612f41685f01346 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    ConfAnalysis.cxx         
 //   
 //
 //                   
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: ConfAnalysis.cxx 800361 2017-03-12 14:33:19Z sutt $
 
@@ -758,6 +756,25 @@ void ConfAnalysis::initialiseInternal() {
   eff_vs_mu   = new Efficiency( mu, "eff_vs_mu");
 
 
+  /// electron specific histograms
+
+  double etovpt_bins[39] = {
+    0,        0.1,      0.2,     0.3,     0.4,      0.5,       0.6,      0.7,      0.8,      0.9, 
+    1,        1.08571,  1.17877, 1.2798,  1.3895,   1.50859,   1.63789,  1.77828,  1.9307,   2.09618, 
+    2.27585,  2.47091,  2.6827,  2.91263, 3.16228,  3.43332,  3.72759,  4.04709,  4.39397,  4.77058,  
+    5.17947,  5.62341,  6.1054,  6.6287,  7.19686,  7.81371,  8.48343,  9.21055,  10
+  }; 
+
+  m_etovpt_raw    = new TH1F("etovpt_raw", "ET / pT", 100, 0, 10 );
+
+  m_etovpt        = new TH1F("etovpt", "ET / pT", 38, etovpt_bins );
+  m_eff_vs_etovpt = new Efficiency( m_etovpt, "eff_vs_etovpt");
+
+
+  m_et          = new TH1F("ET", "ET; E_{T} [GeV]", ptnbins, ptbinlims );
+  m_eff_vs_et   = new Efficiency( m_et, "eff_vs_ET" );
+
+
   //  std::cout << "initialize() Directory " << gDirectory->GetName() << " on leaving" << std::endl;
 
   ConfVtxAnalysis* vtxanal = 0;
@@ -850,14 +867,13 @@ void fitSin( TH1D* h, const std::string& parent="" ) {
 
 void ConfAnalysis::finalise() {
 
-  //  std::cout << "\n\nConfAnalysis::finalise() " << name() << std::endl;
-
   //  gDirectory->pwd();
 
   if ( !m_initialised ) return;
 
 
   std::cout << "ConfAnalysis::finalise() " << name();
+
   if ( name().size()<19 ) std::cout << "\t";
   if ( name().size()<30 ) std::cout << "\t";
   if ( name().size()<41 ) std::cout << "\t";
@@ -918,6 +934,10 @@ void ConfAnalysis::finalise() {
   eff_vs_nvtx->finalise();
   eff_vs_mu->finalise();
 
+  m_eff_vs_etovpt->finalise();
+
+  m_eff_vs_et->finalise();
+
   const unsigned Npurity = 6;
   Efficiency* hpurity[Npurity] = {
     purity_pt, 
@@ -938,8 +958,6 @@ void ConfAnalysis::finalise() {
   rd0_vs_phi_rec->Write();
   
 
-  std::cout << "ConfAnalysis::finalise() " << name() << std::endl;
-
   std::string spstr[5] = { "npix", "nsct", "nsi", "ntrt", "nbl" };
   for ( int i=mres.size() ; i-- ; ) { 
     TF1* (*resfit)(TH1D* s, double a, double b) = Resplot::FitNull95;    
@@ -1107,7 +1125,6 @@ void ConfAnalysis::finalise() {
   store().find( vtxanal, "rvtx" );
   if ( vtxanal ) vtxanal->finalise();
 
-
   mdir->pop();
 
 }
@@ -1128,7 +1145,11 @@ double wrapphi( double phi ) {
 
 void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
 			   const std::vector<TIDA::Track*>& testtracks,
-			   TrackAssociator* matcher ) { 
+			   TrackAssociator* matcher, 
+			   TrigObjectMatcher* objects ) { 
+
+  //  leave this commented code in for debug purposes ...
+  //  if ( objects ) std::cout << "TrigObjectMatcher: " << objects << std::endl; 
 
   if ( !m_initialised ) initialiseInternal();
     
@@ -1296,6 +1317,11 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
 
     rd0_vs_phi->Fill( phit, a0t );
 
+    double mu_val = gevent->mu();
+
+    mu->Fill( mu_val );
+
+
     const TIDA::Track* matchedreco = matcher->matched(reftracks[i]); 
 
     //    std::cout << "\t\tConfAnalysis " << name() << "\t" << i << " " << *reftracks[i] << " -> ";        
@@ -1353,7 +1379,23 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
     rnscth_pt->Fill( std::fabs(pTt), nsctht );
 
     rnpix_lb->Fill( gevent->lumi_block(), npixt*0.5 );
+
+    double                 etovpt_val = 0;
+    const TrackTrigObject* tobj       = 0;
     
+    if ( objects ) { 
+      tobj = objects->object( reftracks[i]->id() );
+      if ( tobj ) { 
+	/// track pt is signed - whereas the cal based 
+	/// object ET (massless pt really) is not 
+	etovpt_val = std::fabs( tobj->pt()/reftracks[i]->pT() );
+	m_etovpt->Fill( etovpt_val );
+	m_etovpt_raw->Fill( etovpt_val );
+	m_et->Fill( tobj->pt()*0.001 );
+      }
+    }
+
+
     if ( matchedreco )  {
 
       // efficiency histos
@@ -1379,6 +1421,11 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
 
       eff_vs_lb->Fill( gevent->lumi_block() );
 
+      if ( tobj ) { 
+	m_eff_vs_etovpt->Fill(etovpt_val);    
+	m_eff_vs_et->Fill( std::fabs(tobj->pt()*0.001) );    
+      }
+
       Nmatched++;
 
       /// fill residual histos
@@ -1590,10 +1637,9 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
 
       eff_vs_nvtx->Fill( NvtxCount );
       n_vtx->Fill( NvtxCount );
-      double mu_val = gevent->mu();
+
       //std::cout << "<mu>\t" <<  mu_val << std::endl;
       eff_vs_mu->Fill( mu_val );
-      mu->Fill( mu_val );
 
       //    hnpix_v_sct->Fill( nsctt*0.5, npixt*0.5 );
 
@@ -1790,9 +1836,10 @@ void ConfAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
 
       eff_vs_mu->FillDenom(mu_val);
 
-      mu->Fill( mu_val );
-
-
+      if ( tobj ) { 
+	m_eff_vs_etovpt->FillDenom(etovpt_val);    
+	m_eff_vs_et->FillDenom( std::fabs(tobj->pt()*0.001) );    
+      }
 
       if ( dumpflag ) {
 	std::ostream& dumpstream = dumpfile; 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
index c24ed890d12ef187d222c963c425af4b9f42a139..be1833ed53675d8400e1dd436d321c595de0fee6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfAnalysis.h
@@ -1,18 +1,16 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    ConfAnalysis.h        
 //
 //                   
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: ConfAnalysis.h 800361 2017-03-12 14:33:19Z sutt $
 
 
-#ifndef __CONFANALYSIS_H
-#define __CONFANALYSIS_H
+#ifndef ANALYSIS_CONFANALYSIS_H
+#define ANALYSIS_CONFANALYSIS_H
 
 #include <iostream>
 #include <vector>
@@ -23,6 +21,7 @@
 #include "TrigInDetAnalysis/TIDDirectory.h"
 #include "TrigInDetAnalysis/Efficiency.h"
 #include "TrigInDetAnalysis/TIDARoiDescriptor.h"
+#include "TrigInDetAnalysis/TrigObjectMatcher.h"
 
 #include "TrigInDetAnalysisExample/ChainString.h"
 
@@ -79,7 +78,14 @@ public:
 
   virtual void execute(const std::vector<TIDA::Track*>& reftracks,
                        const std::vector<TIDA::Track*>& testtracks,
-                       TrackAssociator* matcher );
+                       TrackAssociator* matcher, 
+		       TrigObjectMatcher* objects );
+
+  virtual void execute(const std::vector<TIDA::Track*>& reftracks,
+                       const std::vector<TIDA::Track*>& testtracks,
+                       TrackAssociator* matcher ) { 
+    execute( reftracks, testtracks, matcher, 0 );
+  }
 
 #if 0
   virtual void execute(const std::vector<TIDA::Track*>& reftracks,
@@ -151,7 +157,6 @@ private:
   Efficiency* purity_d0;
   Efficiency* purity_a0;
 
-
 #if 0
   TH2F* h2;
   TH2F* h2m;
@@ -306,6 +311,15 @@ private:
   Resplot* rRoi_dphi_vs_eta;
   Resplot* rRoi_dzed_vs_eta;
 
+  /// electron specific ET/PT related stuff
+  TH1F*       m_etovpt_raw;
+  TH1F*       m_etovpt;
+  Efficiency* m_eff_vs_etovpt;
+
+  TH1F*       m_et;
+  Efficiency* m_eff_vs_et;
+
+
   /// flag to print out the matched tracks etc
   bool m_print;
 
@@ -328,7 +342,7 @@ inline std::ostream& operator<<( std::ostream& s, const ConfAnalysis& _s ) {
 
 
 
-#endif  // __CONFANALYSIS_H 
+#endif  // ANALYSIS_CONFANALYSIS_H 
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
index 688536dd2bb1af9b1588c4c52232b2b6e2355e78..077ba4828fa13d1a8944873aed47e29370d87c38 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    ConfVtxAnalysis.cxx         
 //   
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 05304f68822ce9e8bc699d1722c3713bf14b44eb..0faf3bd5b2366c374d73e8e3a870c3b416bad3df 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/ConfVtxAnalysis.h
@@ -1,12 +1,10 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    ConfVtxAnalysis.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 2271cde09de97ef4e4f11b89f0b89a1cc271871d..7d2aea6ab3ca7094f57fb085b276928427d409b4 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Contour.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Contour.h
@@ -1,12 +1,10 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    Contour.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 2c82a61c64683efdd36a14ff4d58062b374e28a8..b91944613ab47832e30e39f033c0ae2f88c5cf1f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/DrawLabel.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/DrawLabel.h
@@ -1,12 +1,10 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    DrawLabel.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: DrawLabel.h, v0.0   Sun 11 Nov 2012 01:18:14 GMT sutt $
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile
index 5a8bceb92afe95c677fc3c106665e3751f16a0c1..1476a03a590ac271365423af6299dc0d05d19e44 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/Makefile
@@ -32,67 +32,34 @@ endif
 ifeq ($(TestArea),)
     ATLASBASE = $(HOME)/atlas/TIDA
 else
-#   ATLASBASE = $(TestArea)/Trigger/TrigAnalysis
+    ATLASBASE = $(TestArea)
 #   ATLASBASE = /cvmfs/atlas-nightlies.cern.ch/repo/sw/21.1-dev/2018-04-09T2234/AthenaP1/21.1.24/InstallArea/x86_64-slc6-gcc62-opt/src/Trigger/TrigAnalysis
-    ATLASBASE = /cvmfs/atlas-nightlies.cern.ch/repo/sw/21.1-dev/2018-05-15T2242/AthenaP1/21.1.27/InstallArea/x86_64-slc6-gcc62-opt/src/Trigger/TrigAnalysis
-endif
-
-CMTCONFIG=
+#   ATLASBASE = /cvmfs/atlas-nightlies.cern.ch/repo/sw/21.1-dev/2018-05-15T2242/AthenaP1/21.1.27/InstallArea/x86_64-slc6-gcc62-opt/src/Trigger/TrigAnalysis
 
+#   ifeq ($(AtlasArea),)
+#     ATLASBASE = /cvmfs/atlas-nightlies.cern.ch/repo/sw/21.1-dev/2018-07-31T2248/AthenaP1/21.1.33/InstallArea/x86_64-slc6-gcc62-opt/src/Trigger/TrigAnalysis
+#      ATLASBASE = $TestArea
+#   else
+#     ATLASBASE = $(AtlasArea)/InstallArea/x86_64-slc6-gcc62-opt/src/Trigger/TrigAnalysis
+#   endif
 
+endif
 
-ifeq ($(CMTCONFIG),)
-
-
-#    ATLAS_ARCH = $(shell ./setarch.sh)
-#    ATLAS_ARCH = x86
-
+CMTCONFIG=
 
-    # "PUT YOUR BASE DIRECTORY HERE"
-    # ATLASBASE = $(TestArea)/Trigger/TrigAnalysis/
-    # ATLASBASE = /tmp/sutt/new/Trigger/TrigAnalysis
-    # ATLASBASE = $(ATLAS_TEST_AREA)/Trigger/TrigAnalysis
-    # ATLASBASE = $(TestArea)/Trigger/TrigAnalysis
-    # ATLASBASE = $(HOME)/atlas/TIDA
-    # ATLASBASE = /tmp/sutt/duff/Trigger/TrigAnalysis
-    # ATLASBASE = /tmp/sutt/tida/Trigger/TrigAnalysis/
 
-    USEATHENALIBS = 0	
+USEATHENALIBS = 0	
 
-#    ifeq ($(USER),sutt)
-       # sutt uses with_version_directory so need the versions
-#       TID   = $(ATLASBASE)/TrigInDetAnalysis/TrigInDetAnalysis-01-01-27
-#       TIDU  = $(ATLASBASE)/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils-00-01-57
-#       TIDE  = $(ATLASBASE)/TrigInDetAnalysisExample/TrigInDetAnalysisExample-00-03-07
-#      TIDUB = $(ATLASBASE)/TrigInDetAnalysisUser/TrigInDetAnalysisUser-00-01-11
-#       TIDUB = ../..
-#    else
+TID   = $(ATLASBASE)/Trigger/TrigAnalysis/TrigInDetAnalysis
+TIDU  = $(ATLASBASE)/Trigger/TrigAnalysis/TrigInDetAnalysisUtils
+TIDE  = $(ATLASBASE)/Trigger/TrigAnalysis/TrigInDetAnalysisExample
+TIDUB = $(ATLASBASE)/Trigger/TrigAnalysis/TrigInDetAnalysisUser
 
-       TID   = $(ATLASBASE)/TrigInDetAnalysis
-#      TIDU  = $(ATLASBASE)/TrigInDetAnalysisUtils
-       TIDU  = $(TestArea)/Trigger/TrigAnalysis/TrigInDetAnalysisUtils
-       TIDE  = $(ATLASBASE)/TrigInDetAnalysisExample
 #      TIDUB = $(ATLASBASE)/TrigInDetAnalysisUser
-       TIDUB = $(TestArea)/Trigger/TrigAnalysis/TrigInDetAnalysisUser
-#    endif
+#      TIDU  = $(TestArea)/Trigger/TrigAnalysis/TrigInDetAnalysisUtils
+#      TIDUB = $(TestArea)/Trigger/TrigAnalysis/TrigInDetAnalysisUser
 
-    CXXFLAGS += -I$(TID) -I$(TIDU) -I$(TIDE) -fPIC 	
-
-else 
-
-    USEATHENALIBS = 1 	
-
-    ATLASBASE = $(TestArea)/Trigger/TrigAnalysis
-#   ATLASBASE = $(TestArea)/InstallArea
-
-    TID   = $(ATLASBASE)/TrigInDetAnalysis
-    TIDU  = $(ATLASBASE)/TrigInDetAnalysisUtils
-    TIDE  = $(ATLASBASE)/TrigInDetAnalysisExample
-    TIDUB = ../..
-
-    CXXFLAGS += -I$(TID) -I$(TIDU) -I$(TIDE) 	
-
-endif
+CXXFLAGS += -I$(TID) -I$(TIDU) -I$(TIDE) -fPIC 	
 
 
 ARCH_TYPE = $(ATLAS_ARCH)
@@ -143,9 +110,9 @@ CC  = gcc
 # DEPENDENCIES = $(patsubst %.cpp, %.d, $(CSOURCES))
 
 
-CXXFLAGS += -g -D_STANDALONE 
-CFLAGS   += -g -D_STANDALONE 
-# -D_UPGRADE  -D__OLD
+CXXFLAGS += -g
+CFLAGS   += -g
+
 
 
 CXXFLAGS += -I. -I$(TID) -I$(TIDU) -I$(TIDE) $(ROOTCFLAGS) -Wno-deprecated   
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx
index 5a6a213f93f3768b479ed8ded0540adec6bbb41a..9a6f0b90dfc028ef736ccf3c677242a26618b658 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    PurityAnalysis.cxx         
 //   
 //
 //                   
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: PurityAnalysis.cxx 688225 2015-08-07 20:12:06Z sutt $
 
@@ -284,7 +282,7 @@ void duff(const std::string& label="") {
 
 void PurityAnalysis::execute(const std::vector<TIDA::Track*>& reftracks,
 			     const std::vector<TIDA::Track*>& testtracks,
-			     TrackAssociator* matcher ) 
+			     TrackAssociator*   matcher )
 {
   if ( m_print ) std::cout << "PurityAnalysis::execute() \t " << name() 
 			   << "\tref "  <<  reftracks.size() 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h
index 27b51e115644f643fd6e7bbd0ebd5ac2883bad1f..8b2c2db2cef06d161fbcf047620be4632b1d1fa4 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/PurityAnalysis.h
@@ -1,18 +1,16 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    PurityAnalysis.h        
 //
 //                   
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: PurityAnalysis.h 688225 2015-08-07 20:12:06Z sutt $
 
 
-#ifndef __PURITYANALYSIS_H
-#define __PURITYANALYSIS_H
+#ifndef ANALYSIS_PURITYANALYSIS_H
+#define ANALYSIS_PURITYANALYSIS_H
 
 #include <iostream>
 #include <vector>
@@ -22,6 +20,7 @@
 #include "TrigInDetAnalysis/Track.h"
 #include "TrigInDetAnalysis/TIDDirectory.h"
 #include "TrigInDetAnalysis/Efficiency.h"
+
 // #include "TrigInDetAnalysis/Efficiency2D.h"
 
 #include "Resplot.h"
@@ -33,9 +32,10 @@
 
 
 class PurityAnalysis : public TrackAnalysis { 
-  
-  //  private:
-  //     typedef std::map<std::string, TH1F*> maptype; 
+
+public:
+
+  using TrackAnalysis::execute;
 
 public:
   
@@ -136,7 +136,7 @@ inline std::ostream& operator<<( std::ostream& s, const PurityAnalysis& _s ) {
 
 
 
-#endif  // __PURITYANALYSIS_H 
+#endif  // ANALYSIS_PURITYANALYSIS_H 
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h
index 99488545cbc4a33a483f6db0962d07e4239ce9b7..7c2da0caff11597b8d05990842a7c7e7802dad4c 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/RoiFilter.h
@@ -1,12 +1,10 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    RoiFilter.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 5fa7f9225fd0e94298cfc8903c98cdd57e5a3084..92be0bed0951a3170b639a8eb959e64d7dd96d0f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chainparser.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    selectblock.cxx         
 //   
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 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/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
index 35e3ca1c341b99c7928409faf5edcad60b5e4440..54d7a9b85c8296c8f33d079e42527c6dbdc90b15 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/chains.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    chains.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: chains.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 04575c9906a45be194f93573f6222ab70a99cec3..41f8db40b29a85f914e914017b99d4e594e4f637 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/comparitor.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    comparitor.cxx         
 //   
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 ad94f66d55e3ad8ba54211bf47fc17a39192ef8e..529a9e927b891edf8857d0f2c86e703aeb16649d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    computils.cxx         
 //   
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 a561efae9b60cde415952b11ea34cc598563b1e3..03b4ad39fc26e066971f2caccebc45b6ddca485a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/computils.h
@@ -1,13 +1,11 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    computils.h         
 //   
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 fae1d55cfc51cec03dfbbc02089467e049b0ba80..1d2fb451cb099bb2e16045111a416f7ffbe0d6f6 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/cpucost.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    cpucost.cxx
 //
 //
 //   @author B.Sowden
 //
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 6e488bf0687641cff15addd1b4d0795e4e1035b9..f1945766a93b1d806cfd9d70aa38b87d48c2e8fd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/dataset.h
@@ -1,18 +1,16 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    dataset.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: dataset.h 760843 2016-07-09 23:56:54Z sutt $
 
 
-#ifndef __DATASET_H
-#define __DATASET_H
+#ifndef ANALYSIS_DATASET_H
+#define ANALYSIS_DATASET_H
 
 #include <cstdio>
 #include <cstdlib>
@@ -104,7 +102,7 @@ inline std::ostream& operator<<( std::ostream& s, const dataset& _d ) {
 }
 
 
-#endif  // __DATASET_H 
+#endif  // ANALYSIS_DATASET_H 
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h
index fc97046e79c39b0f38eca1c982a5fd939ac30c02..c4450e77df96b189364df7e99eb89e4362648191 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/default_panels.h
@@ -1,7 +1,12 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    default_panels.h        
+//                    
+//
+//   $Id: default_panels.h, v0.0   Fri 11 Jan 2019 07:06:38 CET sutt $
+//
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
 /**************************************************************************
  **
  **   @file         default_panels.h  
@@ -138,8 +143,8 @@ std::string diff_panel[10][6] = {
     { "rd0_vs_eta/sigma",         "Residual d vs #eta",           "xaxis:lin",           "Offline #eta",          "yaxis:lin:auto",  "d_{0} resolution [mm]" },                    
     { "rd0_vs_pt/sigma",          "Residual d vs p_{T}",          "xaxis:log:auto",      "Offline p_{T} [GeV]",   "yaxis:lin:auto",  "d_{0} resolution [mm]" },
 
-    { "rd0_vs_signed_pt/sigma",   "Residual d vs signed p_{T}",   "xaxis:lin:autosym:-80:80",  "Offline p_{T} [GeV]",   "yaxis:lin:auto",  "d_{0} resolution [mm]" },    
-    { "rzed_vs_signed_pt/sigma",  "Residual z vs signed p_{T}",   "xaxis:lin:autosym:-80:80",  "Offline p_{T} [GeV]",   "yaxis:lin:auto",  "z_{0} resolution [mm]" }    
+    { "rd0_vs_signed_pt/sigma",   "Residual d vs signed p_{T}",   "xaxis:lin:-100:100",  "Offline p_{T} [GeV]",   "yaxis:lin:auto",  "d_{0} resolution [mm]" },    
+    { "rzed_vs_signed_pt/sigma",  "Residual z vs signed p_{T}",   "xaxis:lin:-100:100",  "Offline p_{T} [GeV]",   "yaxis:lin:auto",  "z_{0} resolution [mm]" }    
 
 };
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h
index 8ac27521a0011d51fb6d76b4716c7444036349cc..5e7f8201b59ad2872a38f880f0900e6ad8cfbb31 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/effic2.h
@@ -1,6 +1,12 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+// emacs: this is -*- c++ -*-
+//
+//   @file    effic2.h        
+//                    
+//
+//   $Id: effic2.h, v0.0   Fri 11 Jan 2019 07:06:38 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 544c1da823c4aa0e440e66212d882e70ca3a8469..be4f5990ac24ef4be52ffc2b7babb3aca5672dcd 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/event_selector.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/event_selector.h
@@ -1,18 +1,16 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    event_selector.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: event_selector.h 513250 2012-08-10 14:35:11Z sutt $
 
 
-#ifndef __EVENT_SELECTOR_H
-#define __EVENT_SELECTOR_H
+#ifndef ANALYSIS_EVENT_SELECTOR_H
+#define ANALYSIS_EVENT_SELECTOR_H
 
 #include <iostream>
 #include <set>
@@ -48,7 +46,7 @@ inline std::ostream& operator<<( std::ostream& s, const event_selector& _e ) {
 }
 
 
-#endif  // __EVENT_SELECTOR_H 
+#endif  // ANALYSIS_EVENT_SELECTOR_H 
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx
index 7011842259cf9cc48abd9ef94a13086a1b4af028..4dd8e4b1d6af74957e92ee806ae0e6d108d52adf 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/fastadd.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    fastadd.cxx         
 //            navigates through the directory structure of identically organised
@@ -8,6 +5,7 @@
 //            
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 c375bba82f4b0c534134f6bd95b87613fd07eebd..62c42110943c162de0adbdb6005953370708f072 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    globals.cxx         
 //   
@@ -9,6 +6,7 @@
 //
 //   $Id: globals.cxx, v0.0   Sun 12 Mar 2017 15:21:12 CET sutt $
 //
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 #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 566ac334ebe442773b0eaaf889bad128d37c3bf4..80303301598e9242107d0e351d83e6657f4c710b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/globals.h
@@ -1,13 +1,11 @@
 // 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) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 #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 76ecf2c0d4cc7caba00fe1b74dac776c20e6b9f3..17334c56bdfc233a94abec0faf56ee642a967cf9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/grl_run.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/grl_run.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    grl_run.h        
 //
@@ -9,6 +6,7 @@
 //            run number and a vector of ( first, last ) pairs of valid 
 //            lumi block ranges                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 5ccd32fc21a5d7c2e3ebec3e247d577a65021f04..bdd51902fa1dec70626036259daef1e22a1b899b 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/label.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/label.h
@@ -1,12 +1,10 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    label.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 a1cc64bb45bf6e21d0d86b95a17f0f4e55579a28..39de07d2943aaccb14bfd58d2001befa8256b986 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/listroot.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/listroot.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    listroot.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: listroot.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
 
 #include "simpletimer.h"
 
@@ -137,12 +145,12 @@ double hmax( TH1*& h ) {
 
     
 
-    double _hmax = h->GetBinContent(1);
+    double vhmax = h->GetBinContent(1);
     for ( int i=2 ; i<h->GetNbinsX() ; i++ ) {
-      double _m = h->GetBinContent(i);
-      if ( _m>_hmax ) _hmax = _m;
+      double vm = h->GetBinContent(i);
+      if ( vm>vhmax ) vhmax = vm;
     }
-    return _hmax;
+    return vhmax;
   }
   return 0;
 } 
@@ -154,25 +162,25 @@ public:
 	 const std::string& t, 
 	 TKey* k, TDirectory* d=0, 
 	 const std::vector<inode>& in=std::vector<inode>() ) 
-    : _name(n), _type(t), _key(k), _dir(d), _nodes(in) { }  
+    : m_name(n), m_type(t), m_key(k), m_dir(d), m_nodes(in) { }  
 
-  //  ~inode() { std::cout << "delete " << _name << std::endl; } 
+  //  ~inode() { std::cout << "delete " << m_name << std::endl; } 
   ~inode() { }
 
-  std::string _name;
-  std::string _type;
-  TKey*       _key;
+  std::string m_name;
+  std::string m_type;
+  TKey*       m_key;
 
   /// if this node is, itself a directory
-  TDirectory* _dir;
-  std::vector<inode> _nodes;
+  TDirectory* m_dir;
+  std::vector<inode> m_nodes;
 }; 
 
 
 
-std::ostream& operator<<( std::ostream& s, const inode& _t ) { 
-  s << _t._name << " " << _t._type;
-  //  if ( _t._dir ) s << "\n" << _t._nodes;
+std::ostream& operator<<( std::ostream& s, const inode& t ) { 
+  s << t.m_name << " " << t.m_type;
+  //  if ( t.m_dir ) s << "\n" << t.m_nodes;
   return s;
 }  
 
@@ -201,20 +209,20 @@ class TCck {
   
 public:
 
-  TCck( TDirectory* d, int depth=0 ) : _dir(d), _depth(depth) { } 
+  TCck( TDirectory* d, int depth=0 ) : m_dir(d), m_depth(depth) { } 
 
-  //  ~TCck() { if ( _dir ) std::cout << "delete dir " << _dir->GetName() << std::endl; } 
+  //  ~TCck() { if ( m_dir ) std::cout << "delete dir " << m_dir->GetName() << std::endl; } 
 
   ~TCck() { } 
   
   std::vector<inode> scan( int depth=0 ) { 
-    if ( _nodes.size()==0 ) _scan(depth);
-    return _nodes;
+    if ( m_nodes.size()==0 ) pscan(depth);
+    return m_nodes;
   }
 
 protected:
   
-  void _scan( int depth=0 ) {
+  void pscan( int depth=0 ) {
 
     if ( depth>maxdepth ) return;
 
@@ -222,20 +230,20 @@ protected:
     
     TDirectory* cck = gDirectory;
 
-    int __depth = depth-1;
+    int deptht = depth-1;
 
     bool accept = true;
 
 
-    //    std::cout << "GOLLY! " << _dir->GetName() << "\tdepth " << depth << " " <<  __depth << "\tsize " << directories.size() << " " << directories << std::endl;
+    //    std::cout << "GOLLY! " << m_dir->GetName() << "\tdepth " << depth << " " <<  deptht << "\tsize " << directories.size() << " " << directories << std::endl;
 
 
     if ( directories.size()>size_t(0) ) {
-      if ( __depth>=0 && size_t(__depth)<directories.size() ) {
-	//	std::cout << "directory[" << __depth << "] = " << directories[__depth] << " " << std::string(_dir->GetName()) << std::endl;
-	if ( directories[__depth]!=std::string(_dir->GetName() ) &&
-	     !( // contains( _dir->GetName(), "SMK_" ) &&
-		contains( _dir->GetName(), directories[__depth] ) ) )  accept = false;
+      if ( deptht>=0 && size_t(deptht)<directories.size() ) {
+	//	std::cout << "directory[" << deptht << "] = " << directories[deptht] << " " << std::string(_dir->GetName()) << std::endl;
+	if ( directories[deptht]!=std::string(m_dir->GetName() ) &&
+	     !( // contains( m_dir->GetName(), "SMK_" ) &&
+		contains( m_dir->GetName(), directories[deptht] ) ) )  accept = false;
       }
     }
 
@@ -244,15 +252,15 @@ protected:
 
     if ( !accept ) return;
 
-    //    std::cout << spacer << _dir->GetName() << "\tdepth " << _depth << std::endl; 
+    //    std::cout << spacer << m_dir->GetName() << "\tdepth " << _depth << std::endl; 
   
     spacer += "\t";
 
 
-    _dir->cd();
+    m_dir->cd();
 
 
-    TList* tl  = _dir->GetListOfKeys();
+    TList* tl  = m_dir->GetListOfKeys();
 
 
     for ( int i=tl->GetSize() ; i-- ; ) { 
@@ -269,7 +277,7 @@ protected:
 	if ( std::string(tobj->GetClassName()).find("TDirectory")!=std::string::npos ) { 
 	  tnd = (TDirectory*)tobj->ReadObj();
 	  nodes = TCck( tnd, depth+1 ).scan( depth+1 );
-	  _nodes.push_back( inode( tobj->GetName(), tobj->GetClassName(), tobj, tnd, nodes ) );
+	  m_nodes.push_back( inode( tobj->GetName(), tobj->GetClassName(), tobj, tnd, nodes ) );
 	}
 	else { 
 	  
@@ -291,24 +299,19 @@ protected:
 	  if ( accept && isvetoed(tobj->GetName()) ) accept = false;
 
 	  if ( accept ) { 
-	    _nodes.push_back( inode( tobj->GetName(), tobj->GetClassName(), tobj ) );
+	    m_nodes.push_back( inode( tobj->GetName(), tobj->GetClassName(), tobj ) );
 
 
 	    //	    bool display = true;
 	  
-	    std::cout << "(" << depth << ")\t" << spacer << _nodes.back(); // << " " << tobj->GetName();
+	    std::cout << "(" << depth << ")\t" << spacer << m_nodes.back(); // << " " << tobj->GetName();
 	    
 	    if ( std::string( tobj->GetClassName()).find("TH1")!=std::string::npos ) {
 	      TH1* h = (TH1*)tobj->ReadObj();
 	      h->SetDirectory(0);
-	      //  bool _cck = false;
-
-
-	      //	      if ( isvetoed(tobj->GetName()) ) plot = false;
 
 	      if ( entries!=0 && h->GetEntries()>entries ) { 
 		std::cout << "\tentries " << h->GetEntries() << " \tmean " << h->GetMean() << "\tplot " << plot << "\t"; // << std::endl;
-		//	_cck = true;
 	      }
 
 
@@ -398,10 +401,10 @@ protected:
 
 protected:
   
-  TDirectory*        _dir;
-  std::vector<inode> _nodes;
+  TDirectory*        m_dir;
+  std::vector<inode> m_nodes;
 
-  int                _depth;
+  int                m_depth;
 
   static std::string spacer;
   
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h
index 03db0e18bc3a3f1c03396a6838ca8ce64c3f831a..b7a8b04f865b77f8b9204989fe51cbcd8fc1c239 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiList.h
@@ -1,18 +1,16 @@
 // 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) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: lumiList.h 780225 2016-10-25 10:04:58Z sutt $
 
 
-#ifndef __LUMILIST_H
-#define __LUMILIST_H
+#ifndef ANALYSIS_LUMILIST_H
+#define ANALYSIS_LUMILIST_H
 
 #include <iostream>
 #include <map>
@@ -148,7 +146,7 @@ inline std::ostream& operator<<( std::ostream& s, const lumiList& _l ) {
 }
 
 
-#endif  // __LUMILIST_H 
+#endif  // ANALYSIS_LUMILIST_H 
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
index 7d2f08d012be2c89c0f33af0e21209c49d2dd57e..177a3344a0258280776373540343e281ffb74b7e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/lumiParser.h
@@ -1,12 +1,10 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    lumiParser.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 db59d79bce691ec0165b4496a91165eb5300c2c2..f7d86fb88f13df099ed2ce84f2e2467f222306ab 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/makeSmallRefFile.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    makeSmallRefFile.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: makeSmallRefFile.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 f489114aa81367860a5b02b9147431981ea5b4ce..0bd258a63343cddf674d6956573e17df020faa95 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/reader.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/reader.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    reader.cxx         
 //   
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 d07099b01f943cd88c331baad4a9d133673089eb..79bf8ed14fb7a563cd51ef338d708fe9bd881b89 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/refit.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/refit.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    refit.cxx         
 //            navigates through the directory structure of a file copying 
@@ -9,6 +6,7 @@
 //            
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 dec4df86b15c10db3b9ec5135356e31c76678459..0ba27dfb398576cd96f3034269bd9090d229ab4d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/rmain.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    rmain.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: rmain.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
 
 #include <cstdio>
 
@@ -32,6 +40,7 @@
 #include "TrigInDetAnalysis/Efficiency.h"
 
 #include "TrigInDetAnalysis/TIDARoiDescriptor.h"
+#include "TrigInDetAnalysis/TrigObjectMatcher.h"
 
 
 #include "ReadCards.h"
@@ -44,6 +53,7 @@
 
 #include "ConfVtxAnalysis.h"
 
+
 #include "lumiList.h"
 #include "lumiParser.h"
 #include "dataset.h"
@@ -336,6 +346,11 @@ std::vector<T*> pointers( std::vector<T>& v ) {
 }
 
 
+double ETmin = 0;
+
+bool SelectObjectET(const TrackTrigObject& t) { return std::fabs(t.pt())>ETmin; }
+
+
 int main(int argc, char** argv) 
 {
 
@@ -356,6 +371,7 @@ int main(int argc, char** argv)
   ///        the config file, and then override them with command 
   ///        line arguments later? Theres only one way to find out...
   
+  std::cout << "$0 :: compiled " << __DATE__ << " " << __TIME__ << std::endl; 
 
   /// get a filename from the command line if present
 
@@ -519,7 +535,8 @@ int main(int argc, char** argv)
     }
   }
 
-  if ( inputdata.isTagDefined("pT") )      pT   = inputdata.GetValue("pT");
+  if ( inputdata.isTagDefined("pT") )      pT    = inputdata.GetValue("pT");
+  if ( inputdata.isTagDefined("ET") )      ETmin = inputdata.GetValue("ET");
 
   /// here we set a pTMax value less than pT, then only set the max pT in the 
   /// filter if we read a pTMax value *greater* than pT
@@ -623,22 +640,24 @@ int main(int argc, char** argv)
     }
   }
 
-  // Clean this up, it's a right mess and could surely be automated
   if ( use_custom_ref_roi ) {
     std::cout << "****                                              \t****" << std::endl;
     std::cout << "**** Custom RoI will be used to filter ref. tracks\t****" << std::endl;
-    if ( !custRefRoi_chainList.empty()  ) {
-      std::cout << "****    Applying custom RoI only to specified chains\t****" << std::endl;
- 
-      if ( custRefRoi_params[0] != -999. ) std::cout << "****    etaHalfWidth = " << custRefRoi_params[0] << "\t\t\t\t****" << std::endl;
-      else                                 std::cout << "****    etaHalfWidth = value used in trigger RoI\t****" << std::endl;
+
+    if ( custRefRoi_params[0] != -999. ) std::cout << "****    etaHalfWidth = " << custRefRoi_params[0] << "\t\t\t\t****" << std::endl;
+    else                                 std::cout << "****    etaHalfWidth = value used in trigger RoI\t****" << std::endl;
+      
+    if ( custRefRoi_params[1] != -999. ) std::cout << "****    phiHalfWidth = " << custRefRoi_params[1] << "\t\t\t\t****" << std::endl;
+    else                                 std::cout << "****    phiHalfWidth = value used in trigger RoI\t****" << std::endl;
       
-      if ( custRefRoi_params[1] != -999. ) std::cout << "****    phiHalfWidth = " << custRefRoi_params[1] << "\t\t\t\t****" << std::endl;
-      else                                 std::cout << "****    phiHalfWidth = value used in trigger RoI\t****" << std::endl;
+    if ( custRefRoi_params[2] != -999. ) std::cout << "****    zedHalfWidth = " << custRefRoi_params[2] << "\t\t\t\t****" << std::endl;
+    else                                 std::cout << "****    zedHalfWidth = value used in trigger RoI\t****" << std::endl;
       
-      if ( custRefRoi_params[2] != -999. ) std::cout << "****    zedHalfWidth = " << custRefRoi_params[2] << "\t\t\t\t****" << std::endl;
-      else                                 std::cout << "****    zedHalfWidth = value used in trigger RoI\t****" << std::endl;
+    if ( !custRefRoi_chainList.empty()  ) {
+      std::cout << "****                                                \t****" << std::endl;
+      std::cout << "****    Applying custom RoI only to specified chains\t****" << std::endl;
     }
+    std::cout << "****                                              \t****" << std::endl;
   }
   
   // Checking for SelectRoi after any other options that will set select_roi, to ensure that the value set
@@ -1588,17 +1607,30 @@ int main(int argc, char** argv)
 
     const TIDA::Chain* refchain = 0;
 
+    TrigObjectMatcher tom;
+
     for (unsigned int ic=0 ; ic<chains.size() ; ic++ ) { 
       if ( chains[ic].name()==refChain ) { 
+
 	refchain = &chains[ic];
      	foundReference = true;
+
 	//Get tracks from within reference roi
         //        ibl_filter( chains[ic].rois()[0].tracks() ); 
+
 	refTracks.selectTracks( chains[ic].rois()[0].tracks() );
+
+	/// get objects if requested
+
+	if ( chains[ic].rois()[0].objects().size()>0 ) { 
+	  tom = TrigObjectMatcher( &refTracks, chains[ic].rois()[0].objects(), SelectObjectET );
+	}
+
 	break;
+
       }
     }
-
+    
     if ( !foundReference ) continue;
     
     if ( debugPrintout ) { 
@@ -1606,10 +1638,7 @@ int main(int argc, char** argv)
       std::cout << "reference chain:\n" << *refchain << std::endl;
     }
     
-
-    //    std::cout << " chains size " << track_ev->chains().size() << std::endl;
-
-    for (unsigned int ic=0 ; ic<track_ev->chains().size() ; ic++ ) { 
+    for ( unsigned ic=0 ; ic<track_ev->chains().size() ; ic++ ) { 
 
       TIDA::Chain& chain = track_ev->chains()[ic];
 
@@ -1618,30 +1647,20 @@ int main(int argc, char** argv)
       /// find the analysis for this chain - is there a matching analysis?
       std::map<std::string,TrackAnalysis*>::iterator analitr = analysis.find(chain.name());
 
-      /// no matching analysis so continue 
+      /// if no matching analysis then continue 
+
       if ( analitr==analysis.end() ) continue;
-      // std::cout << "\t" << ic << " chain " << chain.name() << " size " << chain.size() << "\t: processing" << std::endl;
-      // cout << "\tNumber of rois for " << chain.name() << " " << chain.size() << endl;
+
 
       if ( debugPrintout ) { 
 	std::cout << "test chain:\n" << chain << std::endl;
       }
-
-
-
-
-
-
-
-
+      
       
       for (unsigned int ir=0 ; ir<chain.size() ; ir++ ) { 
-	
 
 	/// get the rois and filter on them if required 
 
-	//	std::cout << "\troi " << ir << std::endl;
-
 	TIDA::Roi& troi = chain.rois()[ir]; 
         TIDARoiDescriptor roi( troi.roi() );
 
@@ -1650,14 +1669,10 @@ int main(int argc, char** argv)
 
 	if ( filterRoi && !roiFilter.filter( roi ) ) continue; 
 	
-	
 	/// select the test sample (trigger) vertices
 	const std::vector<TIDA::Vertex>& mvt = troi.vertices();
 
 
-
-
-
 	std::vector<TIDA::Vertex> vertices_test;
 	
 	int     selectvtx = -1;
@@ -1702,7 +1717,7 @@ int main(int argc, char** argv)
 	//	std::cout << "beamline: " << chain.name() << "  " << beamline_test << std::endl; 
 
 	//set values of track analysis to these so can access elsewhere
-	for ( int i=analyses.size() ; i-- ; ) {
+	for ( size_t i=analyses.size() ; i-- ; ) {
 
           TrackAnalysis* analy_track = analyses[i];
 	  
@@ -1772,6 +1787,7 @@ int main(int argc, char** argv)
 
 	std::vector<TIDA::Track*>  refp_vec = refTracks.tracks( refFilter );
 	
+
 	// Selecting only truth matched reference tracks
 	if ( truthMatch ) { 	  
 	  /// get the truth particles ...
@@ -1840,10 +1856,37 @@ int main(int argc, char** argv)
 	      refp_vec = reft;
 	    }
  	  }
-	}
+	}    
+	
+	/// if requesting an object match, remove any tracks which correspond to an object
+	/// below the object PT threshold 
+
+	/// only bother is objects actual exists
 
+	if ( tom.status() ) {  
 	
+	  std::string objectET = cf->config().postvalue("ET");
+
+	  if ( objectET != "" ) {  
+	    
+	    double ETconfig = std::atof( objectET.c_str() );
+	    
+	    if ( ETconfig>0 ) {
+
+	      std::vector<TIDA::Track*>::iterator itr=refp_vec.begin() ; 
+
+	      while (  itr!=refp_vec.end() ) { 
+		const TrackTrigObject* tobj = tom.object( (*itr)->id() );
+
+		if ( tobj==0 || tobj->pt()<ETconfig ) refp_vec.erase( itr );
+		else itr++;
+	      }
+	    }
+	  }
+	}
+
 	const std::vector<TIDA::Track*>&  refp  =  refp_vec;
+
 	
 	//	if ( debugPrintout ) { 
 	//	  std::cout << "refp.size() " << refp.size() << " after roi filtering" << std::endl; 
@@ -1921,7 +1964,8 @@ int main(int argc, char** argv)
 
 	_matcher->match( refp, testp);
 	
-	analitr->second->execute( refp, testp, _matcher );
+	if ( tom.status() ) analitr->second->execute( refp, testp, _matcher, &tom );
+	else                analitr->second->execute( refp, testp, _matcher );
 
 	ConfVtxAnalysis* vtxanal = 0;
 	analitr->second->store().find( vtxanal, "rvtx" );
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx
index d3f8c95f23e616708afaabced2feba12b5249c84..b84bf80e22ef0ccb06fcc32583244f30c8e60676 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/runtool.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    runtool.cxx         
 //   
 //
 //   @Author.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 39596f3d0fc79bce5d5a05ba91dfad428754d9a9..4403e743cf388a6aab4adf199091d27a46e34851 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/simpletimer.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/simpletimer.h
@@ -1,18 +1,16 @@
 // 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) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $Id: simpletimer.h, v0.0   Thu 22 Jan 2009 15:51:52 GMT sutt $
 
 
-#ifndef __SIMPLETIMER_H
-#define __SIMPLETIMER_H
+#ifndef ANALYSIS_SIMPLETIMER_H
+#define ANALYSIS_SIMPLETIMER_H
 
 #include <time.h>
 #include <sys/time.h>
@@ -43,7 +41,7 @@ inline double simpletimer_stop(const struct timeval& start_time)
 //}
 //#endif
 
-#endif /* __SIMPLETIMER_H */
+#endif /* ANALYSIS_SIMPLETIMER_H */
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
index 3274438f7be977d77182c9353b8c10107a7bfa6f..49064034d423e792b628fe566aa0f28c82ef7bbc 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/skim.cxx
@@ -1,12 +1,10 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    reader.cxx         
 //   
 //
 //   @author M.Sutton
 // 
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 9fa499d2742deb1e6ebe2763cd9a1643d8e6c5ea..2c3be217a33ab073f814b3b4eaf2a1148e2cd306 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/wmain.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/wmain.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    wmain.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: wmain.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 880b2603be8bc3887a689619cb755835da873e99..3645fae862921e505ea973c644a460ced1c2827f 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/zbeam.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Analysis/src/zbeam.h
@@ -1,12 +1,10 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 //
 //   @file    zbeam.h        
 //
 //                   
 //  
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 638f7904cdf184dd96e0eef06385e4dcec5fe5d5..2b7144bfb5ae65d9b41803d73f0e074d1431c540 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 
 /**************************************************************************
  **
@@ -14,6 +11,8 @@
  **
  **   Created:      Fri Aug 12 17:40:22 CEST 2005
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 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 11ee7b265930bf12feca90e16cb50fb914338da4..a774f2d8e33cb97d34f5056610b8bc701e054a64 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/IReadCards.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         IReadCards.h  
@@ -14,14 +11,16 @@
  **
  **   Created:      Fri Aug 12 17:40:56 CEST 2005
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __IREADCARDS_H
-#define __IREADCARDS_H
+#ifndef READCARDS_IREADCARDS_H
+#define READCARDS_IREADCARDS_H
 
 
 #ifdef __cplusplus
@@ -44,7 +43,7 @@ extern "C" {
 
 
 
-#endif  /* __IREADCARDS_H */
+#endif  /* READCARDS_IREADCARDS_H */
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
index 5be00111edfc2d46efacbc1b9abcba329a55d2a6..2d5e79f5f50d7a857c12c53a7651c39a31058f13 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         ReadCards.cxx        
@@ -12,10 +9,14 @@
  **
  **   Created:      Tue Apr 26 13:44:42 CEST 2005
  **   Modified:     Sat Mar 18 10:09:14 GMT 2006
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
+
+
 #include <string>
 #include <algorithm>
 
@@ -34,12 +35,12 @@ std::vector<std::string> ReadCards::mPath;
 /** set up the search path for the config files
  **/
 
-#ifdef _DIR_
+#ifdef  RESPLOTDIR_TMP
 #define SREPLACE(s) REPLACE(s)
 #define REPLACE(s) #s
-#define __DIR__ SREPLACE(_DIR_)
+#define RESPLOTDIR  SREPLACE(RESPLOTDIR_TMP)
 #else
-#define __DIR__ ""
+#define RESPLOTDIR ""
 #endif
 
 void ReadCards::CreatePath() { 
@@ -51,12 +52,12 @@ void ReadCards::CreatePath() {
     }
   }
   mPath.push_back("");
-  mPath.push_back(std::string(__DIR__)+"/");
+  mPath.push_back(std::string( RESPLOTDIR )+"/");
   //  for ( int i=0 ; i<mPath.size() ; i++ )   cout << "ReadCards>>CreatePath() mPath[" << i << "]=" << mPath[i] << endl;
 }
 
 
-/** check for file in cwd or if not, check in the __DIR__, then read the file
+/** check for file in cwd or if not, check in the RESPLOTDIR, then read the file
  **/
 
 void ReadCards::Construct(const std::string& filename) {
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h
index 5497002ecb095c2420b6911c4742ef862959bc08..ed3d6b7fa2f61448a4e905efcfea75c42b97572a 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/ReadCards.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         ReadCards.h  
@@ -14,14 +11,16 @@
  **
  **   Created:      Tue Apr 26 13:44:30 CEST 2005
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __READCARDS_H
-#define __READCARDS_H
+#ifndef READCARDS_READCARDS_H
+#define READCARDS_READCARDS_H
 
 #include <iostream>
 #include <sstream>
@@ -252,7 +251,7 @@ private:
 
 };
 
-#endif  /* __READCARDS_H */
+#endif  /* READCARDS_READCARDS_H */
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx
index e1ffbc2f5bb4a3859500f10069fd9f1becae539c..767ab192a82dbd6b6af27a16a1a0b773ebf89cb2 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 
 /**************************************************************************
  **
@@ -14,6 +11,8 @@
  **
  **   Created:      Fri May 11 17:29:29 BST 2007
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 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 1e34d423052795590ee21ad41b4c41c2747d218b..02d000d91bbad237e0134e72e17a9b294c78db7d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/Value.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*- 
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         Value.h  
@@ -14,14 +11,16 @@
  **
  **   Created:      Wed May  4 11:14:42 BST 2005
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __VALUE_H
-#define __VALUE_H
+#ifndef READCARDS_VALUE_H
+#define READCARDS_VALUE_H
 
 
 #include <string>
@@ -63,7 +62,7 @@ private:
 std::ostream& operator<<(std::ostream& s, const Value& v);
 
 
-#endif  /* __VALUE_H */
+#endif  /* READCARDS_VALUE_H */
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx
index b16a7d79481b8d5c9d71694edf7ecf7de93fc675..25541fc18cd062a5653875f5d890a04f2f5c97c1 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/main.cxx
@@ -1,6 +1,13 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    main.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: main.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 d014f435162f27aa4663401c777edd5d8e061696..a8b175ebad4488b7cc32a0def7ee1a80c9afccc8 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 
 /**************************************************************************
  **
@@ -14,6 +11,8 @@
  **
  **   Created:      Thu Jun 23 01:11:43 BST 2005
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 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 27a15df7118d8d6e75d296d28829d7546b031603..40edc1eb00da97f4d463a6b8b8033c8e456c83b9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Readcards/src/utils.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         utils.h  
@@ -14,14 +11,16 @@
  **
  **   Created:      Thu Jun 23 01:53:36 BST 2005
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __UTILS_H
-#define __UTILS_H
+#ifndef READCARDS_UTILS_H
+#define READCARDS_UTILS_H
 
 #include <string>
 #include <vector>
@@ -74,7 +73,7 @@ std::string number(const double& d, const std::string& s="%lf");
 
 
 
-#endif  /* __UTILS_H */
+#endif  /* READCARDS_UTILS_H */
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h
index 8f3f784551813d3522e527a13ef636eb86fb7465..75033f4dcd12386ebb1bf0c3c9f00098e8433cf9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/BasicRandom.h
@@ -1,7 +1,4 @@
 // 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
@@ -18,6 +15,7 @@
 //            This wrapper is to avoid global variables cluttering 
 //            up the place - root is bad enough as it is.
 //
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 9c1b0528c37af0d914784cb904dee74adfcfea9a..28814f1530abce50635b1b17f3b9088538f190d0 100755
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Directory.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         Directory.h  
@@ -14,14 +11,16 @@
  **
  **   Created:      Wed May  4 17:54:25 BST 2005
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __DIRECTORY_H
-#define __DIRECTORY_H
+#ifndef RESPLOT_DIRECTORY_H
+#define RESPLOT_DIRECTORY_H
 
 #include "TDirectory.h"
 #include "TH1.h"
@@ -62,7 +61,7 @@ class Directory {
 
 
 
-#endif  /* __DIRECTORY_H */
+#endif  /* RESPLOT_DIRECTORY_H */
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h
index 86367d45ab53a4c0c85ad6ac9a5f266f2b5a2cc4..7d58a83f9f17d6097c92e9c6933bad4662f56c52 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Random.h
@@ -1,7 +1,4 @@
 // 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 
@@ -11,6 +8,7 @@
 //            This wrapper is to avoid global variables cluttering 
 //            up the place - root is bad enough as it is.
 //
+//   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 //
 //   $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 1b4d110bc033595d5b9dcd6d32fe2c8d98a936d1..1b3d65526c75748e53c00075e5d015078a751735 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.cxx
@@ -1,6 +1,3 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 
 /**************************************************************************
  **
@@ -14,6 +11,8 @@
  **
  **   Created:      Mon Jun 21 18:35:22 BST 2004
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 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 5a666e2ac12213b668b89565190b0bfc23d54945..1c76c1a87b1ab762ec0b455c0da974e4f63d3d8d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/Resplot.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         Resplot.h  
@@ -16,14 +13,16 @@
  **
  **   Created:      Mon Jun 21 18:35:22 BST 2004
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __RESPLOT_H
-#define __RESPLOT_H
+#ifndef RESPLOT_RESPLOT_H
+#define RESPLOT_RESPLOT_H
 
 #include <stdlib.h>
 
@@ -690,5 +689,5 @@ private:
 inline Resplot operator*(double d, Resplot r) { return (r*=d); }
 
 
-#endif  /* __RESPLOT_H */
+#endif  /* RESPLOT_RESPLOT_H */
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h
index b102851701369f9677fc208a8b2ca3d7a0746a41..9125261a27f89e9790b25888226259d3bc939929 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/StatVal.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         StatVal.h  
@@ -13,14 +10,16 @@
  **
  **   Created:      Mon Jun 21 18:35:22 BST 2004
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __STATVAL_H
-#define __STATVAL_H
+#ifndef RESPLOT_STATVAL_H
+#define RESPLOT_STATVAL_H
 
 #include <iostream>
 #include <iomanip>
@@ -64,5 +63,5 @@ inline std::ostream& operator<<(std::ostream& s, const StatVal& sv) {
 
 
 
-#endif  /* __STATVAL_H */
+#endif  /* RESPLOT_STATVAL_H */
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx
index c4a3ae3d910147230533277ce92926979a4cd580..5049b8b79803af06d39fd695a46c307989d1e3ca 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    generate.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:26 CET
+//
+//   $Id: generate.cxx, v0.0   Fri 11 Jan 2019 07:41:26 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 cd5fcf6763ed5d7e1e9a034bb254c690c924561e..37334b8c82867fb541a8cd5bef435ead2e4c5b7d 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/generate.h
@@ -1,6 +1,12 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+// emacs: this is -*- c++ -*-
+//
+//   @file    generate.h        
+//                    
+//
+//   $Id: generate.h, v0.0   Fri 11 Jan 2019 07:06:39 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 427ff9fbfa8be3027cdff6aee207a8b71a480753..5342719b1964f0e47b931acf060e79be56ade1af 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/main.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    main.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:27 CET
+//
+//   $Id: main.cxx, v0.0   Fri 11 Jan 2019 07:41:27 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 da30e167c821f8da4275640d7e2fed8a27797af0..6b979e89f5c989c6134539e56ade8bc573173868 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.cxx
@@ -1,6 +1,14 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+//
+//   @file    rmsFrac.cxx         
+//   
+//
+//   @author sutt
+//   @date   Fri 11 Jan 2019 07:41:27 CET
+//
+//   $Id: rmsFrac.cxx, v0.0   Fri 11 Jan 2019 07:41:27 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 69843018eb8391dcc921f38ea7be7a2d5057c3c0..7d316ba34fcea4b874532619c6e75b289874c8ec 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/rmsFrac.h
@@ -1,6 +1,12 @@
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
+// emacs: this is -*- c++ -*-
+//
+//   @file    rmsFrac.h        
+//                    
+//
+//   $Id: rmsFrac.h, v0.0   Fri 11 Jan 2019 07:06:39 CET sutt $
+//
+//   Copyright (C) 2002-2019 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 074dbbf6ada56aebbbb844f070d56fda771a77aa..a65a3a074bcf24e00e300ff10339b27322c0f05e 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/Resplot/src/tagname.h
@@ -1,7 +1,4 @@
 // emacs: this is -*- c++ -*-
-/*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
 /**************************************************************************
  **
  **   File:         tagname.h  
@@ -14,14 +11,16 @@
  **
  **   Created:      Wed Jun  9 19:44:29 BST 2004
  **   Modified:     
+ **
+ **   Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
  **                   
  **                   
  **
  **************************************************************************/ 
 
 
-#ifndef __TAGNAME_H
-#define __TAGNAME_H
+#ifndef RESPLOT_TAGNAME_H
+#define RESPLOT_TAGNAME_H
 
 
 #include <string>
@@ -74,7 +73,7 @@ private:
 };
 
 
-#endif  /* __TAGNAME_H */
+#endif  /* RESPLOT_TAGNAME_H */
 
 
 
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_chains.dat b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_chains.dat
index 3c259db6aeeaaa0a1d95854b4c2091f63c33cf73..c26adaa65a3e172dacbc3e85e4cb2a42211d4abe 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_chains.dat
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/share/TIDAdata_chains.dat
@@ -53,6 +53,10 @@ testChains = {
     "HLT_e24_medium_L2Star_idperf:InDetTrigParticleCreation_Electron_EFID",
     "HLT_e24_medium_L2Star_idperf:InDetTrigTrackingxAODCnv_Electron_EFID",
 
+    "HLT_e28_medium_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
+    "HLT_e28_medium_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig",
+    "HLT_e28_medium_gsf_idperf:GSFTrigTrackParticles",
+
     "HLT_e5_loose_L2Star_idperf:TrigL2SiTrackFinder_eGamma:0",
     "HLT_e5_loose_L2Star_idperf:TrigL2SiTrackFinder_eGamma:1",
     "HLT_e5_loose_L2Star_idperf:TrigL2SiTrackFinder_eGamma:2",