diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 34d6f744fb9b8428f1cd2b49301c9226263dbbb2..f9595911bf29aecc76cf229bbf172d4edf0dc1af 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 d78aca08cd0674a17b28aded3a5557d926529563..9420fb63a10cf896edd3e3c41e76dc8789706b02 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 75e0611b5bdac408d18473cc33db26c8adcab875..b2cf1d2d22fae76dcf923d802c03d6f82ec7c553 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 c8b19b8532ebf6bf15adf341ec04a789ccf14968..23dba9e3cdc17f8af99b068c78fa7ac8a26d1024 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 575a1afb63c0bcc8dea7443ece6ea7093e62a021..e2c48a07eee17244bfe861ac8f934fe5e36b3ad2 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 18c5dd8866d44373c306ffe1a7ba03d5d152bc65..4e7edcd3338ff2e6a2da5e578a4cf9ed61e6ccdf 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 b7f7269a86f11a9d3bf82fcc0b2f0402854b7ce3..f0ba2e081f0ea56a6ee29bdad501e32cfa000613 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 bc4235230c20c1e500fc4c0d49c1b9c575152506..368e76bf66fa56e35bf64ba20eb2cbda5e97ec6d 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 62c82b479ce8ba2af3c19966cfd80dbffbe9764e..a508bdc56bff7becc74a94a2db27b7ad9ac94dca 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 78ade983d972c6f0cbae3514032afdbed07d7551..1e59ed7a037ed633e644ba8b76f548329968e20d 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 5ba457698f6f689caa8faf87325590bf3858e902..651a8b632b5664bb7d9324fe9a8b184105848642 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 daadbed7ddbdbfc4f2570f4276e568ccef43c7d0..a663bd575ac4be7d6dd2cb20a22dbe1864e42f66 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 bd95bcba18a3ad8e63497dcc536de09bf0ad609b..b79bc2ab93bc441a3c7cf38070e18569cde51464 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 1bbb8bfc84f8b44b5504d7330f6b1df4d43fdaee..6fcad025ceee377f0a052bb2f7ea13eab6d42247 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 d4ac3e1a7d1987bb842dfe9dc9d99cee63fc96c6..3c8d11529e081a3336f31297c858be79a141dd11 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 2d1646941fbcd5342de40ab77ae2f5aa025daf1e..4bb2fb341591c90324724cb7aca1a3721d094b9c 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 79e9e3944c490a2aaf9a9f7772bd2675a57c2b7f..bff7806856739011e86e251e621063fe088bdb1d 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 5ad2802a0545889322a69fca6dd7498813bea7b3..093eae814b4a85cdae5d7f05f94b19855e673436 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 07e5481e666661e5a6c56921748faf96ece1a498..88121cfc165598b26fb196b7cc07b5173a97d494 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 a05b210ae8ef31789ce6b5667104e866af13690a..dbd1c92a497945d8274dc04db4e36f546d4f8050 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 29b283927d5e397acb9cc9b039b3bc59ee4cafaa..6ee330c2a4f456aad5fc6f3cf350f752e2baeab8 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 20279aab587282f43bf304ae7eb5fb4295221b78..eb17b53bfff8d64d1683e6fcea7f967e460a7029 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 59b1b7fcbab6146f67e48cd83a55d47392054f6a..ecadea70f4b70e4c744054007bf244bcbefebcaf 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 a9a6ea47c4263f12dc4260d2b2938aac5f99dc50..512027614bdc65d1aaa6d03ae3346642c625cbb1 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 8630520693944f9afe2adcb8d1d6bf5025d36988..9785bd180dcd7ccc39f7d8388eb4aec80b075adb 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 d67dc14a98c2aa3da76090385a8c2ff4a894611b..a508c8c6744a49b0dbc0c85ba0516777eac34322 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 588da3b5e906ca784bb6fa7aa60aaf2912d1744a..966aa77b677ec7a429b6498851376706e9e9eacb 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 a1f668985342189f07aec53b7319628373a239ba..d177381c4d3beaab33fa7eb022a3a1d231097153 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 6dd2458885b9a048ccff75935c760262f9917b3d..e89fcf8793a763ee9f2b35cc51fc4585b9ff5c06 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 94e82ae66ed9d862894a697d0cb959a97100423f..f1dbaf482802c39e248ad6e9caa87675caf43631 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 2c5d8e8b399dd15a0a27a8618e092db70dff3bdc..c8c85ddb1ae11e7e2c23912a8af3c82b257b62da 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 b8b01b069192ac3c973bf1f05f42fc28c206d4f6..fd8378608bc33c806c252edf5d477c93243acca4 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 be97aefa9843f67178f9004ee1658bea70e27b1e..cf3d232af30215d6fb664f02d3f87d3d7b2e6937 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 1f59540a6ac9db5c1b3cc048181aaed07dd5d8dd..ae208251633a5b565afb004223a225fe0731938a 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 8fda4e0131ad4bbb08e3d11322e74cd56a4261e8..95a53390cdc931773be880cd5606dc7fe16eb4f1 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 e71e68019809d622f4fac37f32872d853280154e..45c345d2c1233de7c33aaa6bec13f8922fdef6e5 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 4f8cfe1f4e35e838f487c1805a624fac51b5dfb3..15a5b37bdfdf63fe527656e02b4eee879567b622 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 8823d0e912c61e5545dc9386d18472f8306ca442..891dca04a68f4ae4c4b483a9bf2bf4c9804f53ca 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 f12fcdc020cbffb67fda41dfe63d0ec0a4c1e4d7..45a20f47e389f6b0e0a96a9718bd758eb6909855 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 381e75f4d4ca8ca1de87939c69240ad9da299417..9193bcf362bcb1207fa98cccde6b78716ba03c77 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 5f5a5759981dd3e13a92232d877fda7f11252192..23af5d448d0a99c3080dd639eb33318d58cd3981 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 d8112321e643dfc7a66dad14a20540cca17cf4b0..d798ccfedfa8949d60f6c30122e99b09bdfdfa8e 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 ba85d68d10465bf091036029664d1c5aaa194aa6..dd55136a7d76746c1cdbf9c9520f1add04cc18e0 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 f86ce6b52365f59cea867f909235cee489b68ab5..88c52c2286b22c1e930fbb55f61b8c95af892824 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 fd734254557a4ff1088f809e1cae03853a80dadd..4defaaa7f8641e08803bfbbc1a227c53e6ea1b14 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 d1300faa949325cbfc3d1b9bc8d9f60c894db1d4..c4be658e121e088814a7189b683dba9779e157fa 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 db6b2574bdaf4c9efd2a586d8ab2d9c4068641fc..e4c7c6b3e7eee95ab96ed7e4dafc0fa9466f68ca 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 31aa3556283512d585e7d09c324fb87efe3965bb..2bd13e4ca024a1df19252f22051ddc7f752868f2 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 dadda109684c779ed129e6ab52ae3ba1f668f5e4..bb8480b8df2facc22979345fdc3aec985acdd58f 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 fd7d72bcbef6768c4b19f40eabf2a9eb9a185f29..cc6ff4c5bc4e71c127e4d5c671ddc6e89582bc47 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 b0739f1fa7c0d05bb9648f701a6f05e81ea3a430..64311b408c49bd6a04a8a17933120c2f0018698f 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 c0d1670df58fe5c180f41a0cc968a09ca5be13cc..4803b29e7cf8aed512f73c78da9be694fa20314e 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 0471227191034acfc5bb0bcafe1e8912c2dae8eb..7967ed6c41ac1417a6a791b8e47f25bf2cbcefef 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 d305f4a6153ce54d197c70ff8a5cdb6a703dfe49..6ddaac2e3d32ad1452689245f6ac77c95192d18f 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 93034b08c7da1e561e68aaef144f41c619b3a89a..d5f42df6bfd7831626134649e0e2d0feba31f1d5 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 de455ea812c034e4d1e95d189b4f59a03cf39ebd..291529a9e1c295d18eec4faa8e126ddd2e048475 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 c6a9630d5028f06771dc3c4502d6817003139451..a05d75b6c3f7809898a7e8d3e6ce84897a6ed399 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 b9551a55df02d39242c397a2c78605c10538c184..dfba5a8015476239568b033e178f67c32ce7daeb 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 7d4aa277b422b44f13a7dcf06934aa80e4ba5e20..d544e69be031d900016b5af11e1365346a09484a 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 c8c698e442a712d21c5a7c0bd159fa4a7daada82..64bc04ac4924fd890158c177c3ad39f6ee31cff2 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 8dc694da663cd6f9522b96576cbc400425d9949c..63a8bef2c62c24333a3650d9db821d1e96cd8e82 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 aa3b07b014491b5b28d859d9423b218d8a3c2542..ab929abf20d7cb7b1291ffa5c862993deefae373 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 dded9d5aa1cb4112282310d4d79cb20b9c359aea..c8de37bbc7a70efff6d132d28a80bf665175ede2 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 1de8ed4cd9ab129b412047d2f81187ebb47d06e9..1da57a6609ad0804093f2109e22bd49232af09b1 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 08a16f47d8ad07f31283e7112687bb7c77fab504..3e410ff70a36e6fb4975b8c3d49f91c006517eca 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 a8f0d3a16e9a6ab4a0b2f5b98b9852f3b9fe379c..10f11da23c9d241429984a7484f370a7b27dafa7 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 97568697a23ba8657dd4437b83a7d14322dba67d..f2b4f70e846d6a408e485df7d522581ca97cb62c 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 49779481bab883d1b7561c8234fe7057f05c9f01..dfdeda817d0ed1ab064f37795427a85edf7c08cb 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 a9789b5549b7d9268fff79995e77ee1ddf4b20e7..bada35bc6384071a3c97d80ab8f922e4eba64739 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 b39d590255360757ca3e3c8ac9cb42670d20caab..840f611cf6896b549e19a2851859babd2bb775e4 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 0ea3602d6f79a40e6e580d3ce29c24f100ef2e3d..6d35457ba0f127b979ae0d3bcadeea5c135bd745 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 eb1cb2afef01f74c3d6e154232dbc69c5a4b7e28..68ddc49a4e24b20874ad46852ab76f52d7990bd0 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 10f84b8a991aa1d5b1c77b3ad74a8f13a84ebe71..3c79c1d35d8a1241bea43ba4d9623f74af75590b 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 85b027e457afba708da04f8128a4e13fc0a3b01e..11f7e8954cc58190188d443a76df49bd0b804855 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 69086aa69fe3b592ab0ea09de7d470252cbb0520..f868c85ea1a9cd1de65af2b0784ce10347fb39b2 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 6e0338db143c7106a153e96b060a9afb63cc0466..837b768d7996447539def0b3cbfa7bd56a52298b 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 5ad3ae9da6ea082d0291da66a54d21c054759b98..64690011c53054b96750bc8a7f7d513fcd88820e 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 58a58efb9dba602354e02d01558ebcf72290ed38..c24ed890d12ef187d222c963c425af4b9f42a139 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 76a31e9aa5d02e2c6cf46a375a0214d7ba77b3fa..688536dd2bb1af9b1588c4c52232b2b6e2355e78 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 c30e3b4ac737f3a9aa714eecf46e9fed142f1afc..05304f68822ce9e8bc699d1722c3713bf14b44eb 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 4801f5e3a25d308229af3ab104d4349e97420875..2271cde09de97ef4e4f11b89f0b89a1cc271871d 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 c44adbd5849c3e186ab5dc95be3ea22d57f7a0b3..2c82a61c64683efdd36a14ff4d58062b374e28a8 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 f17ad761c75c540731f5060535ea3834a46e57e2..5a6a213f93f3768b479ed8ded0540adec6bbb41a 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 a9d007d9a6f00ffeec0e880895a25e5bea1af675..27b51e115644f643fd6e7bbd0ebd5ac2883bad1f 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 ea51bb8dbce3e795895477f4217000401b993463..99488545cbc4a33a483f6db0962d07e4239ce9b7 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 0fb234432a516ed1766d3ee017e061e462786f2e..5fa7f9225fd0e94298cfc8903c98cdd57e5a3084 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 32b14b07bbc79abc8d18c3f89fc7b12d34557634..35e3ca1c341b99c7928409faf5edcad60b5e4440 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 4507d7ecc7197164f9ec88c7fde026994cfe6a82..1c8f97b136e8e6c402653d9247faa1644d65ddd8 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 6d938d303f05575bad3e034b83818ef4ca30e25d..ad94f66d55e3ad8ba54211bf47fc17a39192ef8e 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 655ef43afb747d8112117c4ab13a0e45a36e660d..a561efae9b60cde415952b11ea34cc598563b1e3 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 471a0a3df66469b7b446b996eeceadf26b69f138..fae1d55cfc51cec03dfbbc02089467e049b0ba80 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 f8ea57abf21f909fb07284f1c8393e670f34435a..6e488bf0687641cff15addd1b4d0795e4e1035b9 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 af92bd7b3ce41a748b30bfb5d456a145da2b0b98..fc97046e79c39b0f38eca1c982a5fd939ac30c02 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 f20a36deed998f149ee920b309edb3e0e702d177..8ac27521a0011d51fb6d76b4716c7444036349cc 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 1518c60dc0fd76dbd39052bfc84ffbb69248ed19..544c1da823c4aa0e440e66212d882e70ca3a8469 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 08d8355b7c4f148448dd296083dd59b4e9da8878..7011842259cf9cc48abd9ef94a13086a1b4af028 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 e6e6a3d7bfbbf36e20dd4b066cd14553901b6c53..c375bba82f4b0c534134f6bd95b87613fd07eebd 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 0a7ef44fdb0ce8b83d23fb3a16cc36308a52dd44..566ac334ebe442773b0eaaf889bad128d37c3bf4 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 471d445f3a6065db50cabaf76318d2aa14632716..76ecf2c0d4cc7caba00fe1b74dac776c20e6b9f3 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 390d2588ceaa12a4f5c1af5e7dfa005a7b6bc73d..5ccd32fc21a5d7c2e3ebec3e247d577a65021f04 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 7066c68bd516cca480bcdcc0d24df97dfbe0328a..a1cc64bb45bf6e21d0d86b95a17f0f4e55579a28 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 49552721470959b3dffee636029ecfa56f62f0d1..03db0e18bc3a3f1c03396a6838ca8ce64c3f831a 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 893d5527c2a36b2a05398134e8ab5c880e30f54b..7d2f08d012be2c89c0f33af0e21209c49d2dd57e 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 287f50c75ebc02bf78fa6703358ff09de58434cb..db59d79bce691ec0165b4496a91165eb5300c2c2 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 ad4eb76d330bff1ae2de26eb0c6bd1422f3c609f..f489114aa81367860a5b02b9147431981ea5b4ce 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 3604e3e578cb0393e24bb61f192485a5d09e5003..d07099b01f943cd88c331baad4a9d133673089eb 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 225badee73a50e36526ec75b3f792def0011baf8..dec4df86b15c10db3b9ec5135356e31c76678459 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 1063722da563a93684c8a88a6e47784ebcb2ca2d..d3f8c95f23e616708afaabced2feba12b5249c84 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 24637f06c671700e0cb40b5fbab830c38282a872..39596f3d0fc79bce5d5a05ba91dfad428754d9a9 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 5c440c3aaef00e951e0720213fc91c707a389929..3274438f7be977d77182c9353b8c10107a7bfa6f 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 dda434890fc8fdcefaf187791a798f884f89c98b..9fa499d2742deb1e6ebe2763cd9a1643d8e6c5ea 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 5a257efe7471ac11910fe56266c3c8e521b05fc0..880b2603be8bc3887a689619cb755835da873e99 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 9862f539c6ea8cd161068639fe59b55a579e4583..638f7904cdf184dd96e0eef06385e4dcec5fe5d5 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 00c99e8e7ea0a0799ffeb5631af8e58f2b0992c2..11ee7b265930bf12feca90e16cb50fb914338da4 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 e01455013f81e283277e32264d741914f2e73d82..7ba420b771edbf5a52fa0e21ea326be4d22601b7 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 f728ed232590ba64b334633ab96f18335d27fe85..5497002ecb095c2420b6911c4742ef862959bc08 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 fd27ffa5dd75ed8b80b33e0c919ac6f7d9b758e8..e1ffbc2f5bb4a3859500f10069fd9f1becae539c 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 9c1d74031d32d0f95dea9484514f600523425dfe..1e34d423052795590ee21ad41b4c41c2747d218b 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 585aaf0e847cf13490de4a2e24a678d7fd09c894..b16a7d79481b8d5c9d71694edf7ecf7de93fc675 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 229ca2653de4782b3bdb1b37ead2b4f62a6f74df..d014f435162f27aa4663401c777edd5d8e061696 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 6b5b1c2ec8b4d4f53bd8555571ad91a1944e7d01..27a15df7118d8d6e75d296d28829d7546b031603 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 9db12ea5ea8680b0a86b7c32bccbbdd086a4ce21..8f3f784551813d3522e527a13ef636eb86fb7465 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 91b6eaba0281276f4d8d9096b94065a978bdf5fc..9c1b0528c37af0d914784cb904dee74adfcfea9a 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 ceb2799ac1a489970b1916a9e5778f4eaf1b0ecd..86367d45ab53a4c0c85ad6ac9a5f266f2b5a2cc4 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 718ed172dfeab3433f243100f07908197b01f2d4..1b4d110bc033595d5b9dcd6d32fe2c8d98a936d1 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 11b76fc3c7a4735f36b2f24bd27c70846c9e083a..5a666e2ac12213b668b89565190b0bfc23d54945 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 8b070cdd4e7c6115ad8fa69119fe87fda423e009..b102851701369f9677fc208a8b2ca3d7a0746a41 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 72b588bb531615c5c489fc13b080519b175858ae..c4a3ae3d910147230533277ce92926979a4cd580 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 ef513b3da0b2e5a988716d935a0cc97f1e4eccfa..cd5fcf6763ed5d7e1e9a034bb254c690c924561e 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 286e14e785f38f8af367e0de9bb03b488f2633e2..427ff9fbfa8be3027cdff6aee207a8b71a480753 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 5abf6a9ada560603c2ae6afde7c963152ef2ce38..da30e167c821f8da4275640d7e2fed8a27797af0 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 934964393ff55bd9d48a2d91e47e6a0ad12f6509..69843018eb8391dcc921f38ea7be7a2d5057c3c0 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 337eb8e47cab0d4a0a1bf8dd1ed5e5dcc0124052..074dbbf6ada56aebbbb844f070d56fda771a77aa 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 35fad4c1dc3eb9ccbef8eb34df440b2946f43c96..8170570f95978afc5cd3c1ccbd598a95188d9cc9 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 e84ee9b9e6d33f88da23f8967513e987324390c0..fe5798cedca3c1e3c5343820ffc68d55ad65d770 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 5c01af96876c0586c0599623b5ba2b0432a64042..1fe4c1ab548a52af544b62992040798af5304cd4 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 4064322b0d6f917a55ad1928c8f3ec7b25bd35f4..475190e1dcd4356119ac5ec77a8ff674f93976b7 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 3852fbaae86b2a1e4c4dad3848facaee97d9645f..af3518b95b3a82d0d329edcbc7818791105efe12 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 6e2c977b2e5ceebbf01714a61fe6f9c75a7ac5a2..bbb376f400cdd0b0836a64c28b995550e9ce390a 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 80f439bb76574f5c201ee8b2f89d5662c0cf7b0a..26cd20fcd3fb47809e5252ca78ea8b91816798ef 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 bbbfccaac7e791e4f9f62fdbd675ec44a3dc754f..1d69d3e8863afabfdde0d7cb4578600b558a3822 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 8be32321ec1ce5042327f557ff60fee791d25994..39adc59a0f2138461dffdced7034aaa7eb963ef3 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 c8b7b86d93d4eb4c53382d6e70d407b062a6dda8..55f7d22c69544bfc378c83084370f82db600d48d 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 60f5913c7cf72f40871ad8f950fd3e0d7959251b..6a19b14bc2385e57cbfd39968d91bef7e6c4c249 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 e33dc66f2cb39daf9b5e6f74c1d95c988641df8c..ae86f999004f5456ef9d7288264d8ad602a37e0f 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 e0daf9caa1f6037781e0763d0fe5c2ce48550ab4..e27ae34d76e0d4b00a9175878afdfc683d2ae238 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 cc1e4007eeafb23bccd489ef11c807dbfb899d61..19786b61dcfb20f93586046e24b9cf7ad4db5e16 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 584896dc5ba18d78196b86106682d6d54d4c44d7..90bdc2c86beab856463ad0c64163129e94692544 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 c13d5584f2112312b1268839441c2d6b9db19538..855f5a4980b0e3c62aeb03ad7cbd292acb464bef 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 96615622d0ad0e761822e9002aa52fbd9fe0ab1e..8333e2d7fa9baee1d929708fde9318878ec47628 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 38511358fb8bc1ecafb4011636c1335b6a1222f7..f1af39d41e584201ef8260d4bd0a5fc920a5421f 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 60dfedb78bcd00228a881c19900fe021ba0c9f68..acf26c1f744fab5e6048d652567e2a1e408d66c0 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 56bd6b1d27c7a262db30356f958a314aafde749b..32b6e3eec9c3cbff2f8405af7c750aecdfb93959 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 d5f6066c0c41cc5189067d3bbf2021a845564254..c53663d4ebe37509d4ef95b70c34b5ace632c85a 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 e377049ed528f115e4fdbac367e05e9c9cf8d0fb..e77b6d28bfcfcccd2a240326e9681a0b2f1c648e 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 daa67229f70deb133ea85f8c05bccaeb356696af..4981c9fe229b9cebfd948db34f7e434148a8dd9e 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 99887f70b630db0f6253499529d91cb0d48b2109..e9b733f2356aa5756b4e9969988a479178bf60f3 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 21a9326b7d15b69fe7e21c13e059be0e385cf0c8..ba6b4f31867da4a87e05ea23bc543a23facc3885 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 a6ff8c52c186a0b9b8c6b2c20de91761318d58d5..a10d2db26bd90b9ef46f8cc0374c2833fb6613ed 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 d59303d848cb6e9a2586f723e64fd4128c0e5822..dd64fdc1f257b352a5a216e979297d371987e8a1 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 shitty atlas 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 80f922c812dbfe05edc7612b668daa1f4c29d698..e3a24116f301ef41932fb763606c942e688cc395 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 ccca92f6a79b5c6abc519ef3f2902b15123ea998..c82f3053bbb4bed9e876d30a043018c10537f2e0 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 e32e3db88ef9e782487ad959b0c662d19e964e0f..7e0fb6e7566fea7764aed1fd0be3fac4a0c90522 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 d08a2badf3fb2f6e1fa59eecabee5a4cd02e8c0a..1fd2066756b3a028400c55c77e5e1b5422da6d5c 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 dfa9d7847dc7724b4d53458db6e87ff810dd2c6f..42e4b41311ee8e3290e4bf5498f3a54725d91e44 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 8c17109090b4ea10f20191fc8c5c53637f9c7d99..4538db4c2382af42e28869054f2c24fc1c7bcef9 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 05f0f17c8043f7cf568d46cb59051d58fd021fb0..f5e827d029d22076df52b30b1540f6a20c367f3b 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 35615706ad751721cb65190d2759bfba8f42acf3..630be41ac412ac6542b72f20d55f059b8895496e 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 aa533804c8cdd0d61a2ee0677b2d8dfee24d2706..e919c6ddb438fbdf5c67f784ac49345bc604170e 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 7607bb98324537761f3578b2fd984d4e3738e122..c69dedb7673400c98da0939ea3fa63934cc64340 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 7f1f6df814ea7965d898e00318047a7d67e883d5..2c2e3b4addb469f1df201a4127136539ff4cf2af 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 8c70e88edd12ded25d4cb601ad2da9066ee87e62..2b775eb6e353b187bbcb0e4e0096bc453ad6e586 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 db327e686f6e42db5d6055c92bf578c2b192c892..9b6a3bd591d78b69590210db16c66877d9bb7fad 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 13be81e43d736b89df1df0e0a0fe69b4f67be5ee..25c628c64953cc580941cbb8a4f1b62191ee0847 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 c292674d43fae46ef9500c1d583bf2a7597e1ad2..92b84b63934da32469a1a66f600b73e1817c600f 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 12701b0e809247026f3c78cc5e57b5798c699976..9e812929b2297aff69563cbaecf33f847f15a02e 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 de8e29322b573fa53633d9a2e8e669d3049424e8..628c80560e46dbbb30e1ad6446d0e1949b41894f 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 d2d7a323c3c4a563a429bb17b6ba5e8183cfb93f..c30c83d990b87d0bb34068780c19301c3c47ba6a 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 365aaeda74e8c325aebc28263c24820e81e52d35..f6940f2b3cb1f9b7a5697d8a3bee53c54ea6c641 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 3b362edcec941d52315e2c754e9b9f17226c8d96..ff714d3ed6fac49a1a90404782213c639c5ddb40 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 0d656816194d711c84ec785349819bead0e089d2..3497c279de2a4d3ba3dbc658aa72b95561fe4118 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 25ae0a861b89507f419bcbc8ee8c5ba5d2187832..3b1ab0855e03dabac1e869796db2b58fd72cd048 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 22fc1d625e906b437733811cea0dad20d31f4162..60dac4312ae5b4d809823b836085bb300d7171a0 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 7300e95a8374794837b6aac577ac2e1f9c31f6f3..eb0e4e6b0086c03cc898fd099106bfab815c6add 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 7057ddf8a73b0057c2dea0167a46a5f0d340eb7a..cc62ddab8cb9e86c484277eece7b8042124550af 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 3b483dfd54374682a55756e9bd8a4159699603cf..2bb4dc76dc10a891e7d02938b4c7f9c881cb3cfa 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 81b7dabb4ec12873de7549e670313572347310bc..9d0e27aec81da5d42ccd603fe8d6fc76e2359491 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 4a890c7227a6f353befe5314197f721bb88dde4a..0a75795eccd828d87fd52803cca3225869a0226e 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 7c49699d40e46ffd031c483cc8bfb61c2fb3cbca..0fa8fbf011bcd0a055df71678696c19438a1946d 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 fb22cbcb87c15c4c7c66327e0038b548c6a81517..14d6cce7724e78bffefd6f2a2ddde85116302062 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 013b258c580809a90bd8c350732c5b29760ae669..cee8265c5eb46affab7f39287b46275b760304b9 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 0966198b3da2f312b1394b965aafc409f09d68c7..8fb21e737dd06df29074b65e040e41eff4aeb580 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 be4c79ce9e8861d91669bbd942139c654b4ca117..679bb8ef9c40880aca52b47d914143e5b8ee15c9 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 c7ef1cc6ab2b126c4842b17ae02938f347a28f5d..3d69d18368a0427a581cba70f1d0069560fc5b5c 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 92e0fadf8474905adcf4ed7cea9a14a5ec914880..fd0c133a865b4d8782cdb42ec80aa13353608db1 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
#