diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
index 2491f08ee73933f90093f282127fe4c4f8a024d0..d7fb3422950d514c78c2f4c61a11d29916f211c8 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.cxx
@@ -43,7 +43,6 @@
#include "InDetIdentifier/SCT_ID.h"
#include "InDetIdentifier/PixelID.h"
-#include "TrigInDetPattRecoEvent/TrigL2TimeoutException.h"
#include "TrigInDetPattRecoEvent/TrigInDetTriplet.h"
diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
index e44ad23760b606c2a32dfb2f2361228622c0da22..164f2e79b2fd5206bf02117bded7bb6717eaa154 100644
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/src/TrigFastTrackFinder.h
@@ -34,17 +34,14 @@
#include "AthenaMonitoringKernel/Monitored.h"
class ITrigL2LayerNumberTool;
-class ITrigL2LayerSetPredictorTool;
class ITrigSpacePointConversionTool;
class ITrigL2ResidualCalculator;
class ITrigInDetTrackFitter;
class ITrigZFinder;
class TrigRoiDescriptor;
-class TrigSiSpacePointBase;
class Identifier;
namespace InDet {
- class SiSpacePointsSeed;
- class ISiTrackMaker;
+ class ISiTrackMaker;
class SiTrackMakerEventData_xk;
}
@@ -53,9 +50,6 @@ namespace Trk {
class SpacePoint;
}
-class TrigL2LayerSetLUT;
-class TrigSpacePointStorage;
-class TrigInDetTriplet;
class PixelID;
class SCT_ID;
class AtlasDetectorID;
diff --git a/Trigger/TrigEvent/TrigInDetPattRecoEvent/CMakeLists.txt b/Trigger/TrigEvent/TrigInDetPattRecoEvent/CMakeLists.txt
index 28577c66337150991d71352ea1a752a391e35b15..5642e6fb373f456a906795d514bd70e0e61898d0 100644
--- a/Trigger/TrigEvent/TrigInDetPattRecoEvent/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigInDetPattRecoEvent/CMakeLists.txt
@@ -1,17 +1,8 @@
-################################################################################
-# Package: TrigInDetPattRecoEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigInDetPattRecoEvent )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- DetectorDescription/GeoPrimitives
- Tracking/TrkEvent/TrkParameters
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigSteeringEvent )
-
# External dependencies:
find_package( Eigen )
diff --git a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigInDetRoad.h b/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigInDetRoad.h
deleted file mode 100644
index 05660660b8fc2058599af770285bae6157316b58..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigInDetRoad.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef __TRIG_IN_DET_ROAD_H__
-#define __TRIG_IN_DET_ROAD_H__
-
-#include<cmath>
-#include<set>
-#include<algorithm>
-#include "TrigSteeringEvent/TrigRoiDescriptor.h"
-
-//class TrigRoiDescriptor; TODO: forward declaration?
-
-typedef class TrigInDetRoad {
-
- friend class TrigInDetRoadMakerTool;
- //friend class TrigInDetSpacePointStorage;
-
-public:
- TrigInDetRoad() = delete; //to prevent creation w/o initialization
- TrigInDetRoad(unsigned int id, float pt, float d0) : m_roadId(id), m_minPt(pt), m_maxD0(d0),
- m_eta(0.0), m_etaMin(-5.0), m_etaMax(5.0), m_phi(0.0), m_phiMin(-M_PI),
- m_phiMax(M_PI), m_z0(0.0), m_z0Min(-168.0), m_z0Max(168.0) {};
- TrigInDetRoad(const TrigInDetRoad& r) : m_roadId(r.m_roadId), m_roadSubId(r.m_roadSubId), m_minPt(r.m_minPt),
- m_maxD0(r.m_maxD0),
- m_eta(r.m_eta), m_etaMin(r.m_etaMin), m_etaMax(r.m_etaMax),
- m_phi(r.m_phi), m_phiMin(r.m_phiMin), m_phiMax(r.m_phiMax),
- m_z0(r.m_z0), m_z0Min(r.m_z0Min), m_z0Max(r.m_z0Max),
- m_firstLayer(r.m_firstLayer),
- m_secondLayer(r.m_secondLayer),
- m_thirdLayer(r.m_thirdLayer) {};
- TrigInDetRoad& operator = (const TrigInDetRoad& r) {
- m_roadId = r.m_roadId;
- m_roadSubId = r.m_roadSubId;
- m_minPt = r.m_minPt;
- m_maxD0 = r.m_maxD0;
- m_eta = r.m_eta;
- m_etaMin = r.m_etaMin;
- m_etaMax = r.m_etaMax;
- m_phi = r.m_phi;
- m_phiMin = r.m_phiMin;
- m_phiMax = r.m_phiMax;
- m_z0 = r.m_z0;
- m_z0Min = r.m_z0Min;
- m_z0Max = r.m_z0Max;
-
- m_firstLayer = r.m_firstLayer;
- m_secondLayer = r.m_secondLayer;
- m_thirdLayer = r.m_thirdLayer;
-
- return *this;
- }
-
- bool operator < (const TrigInDetRoad& rhs) const {
- if (this->m_roadId < rhs.m_roadId) {
- return true;
- }
- else if (this->m_roadId == rhs.m_roadId) {
- return this->m_roadSubId < rhs.m_roadSubId;
- }
- else {
- return false;
- }
- }
-
- enum roadLayer {
- firstRoadLayer,
- secondRoadLayer,
- thirdRoadLayer
- };
- unsigned int roadId() const {return m_roadId;}
- unsigned int roadSubId() const {return m_roadSubId;}
- float minPt() const {return m_minPt;}
- float axD0() const {return m_maxD0;}
- float eta() const {return m_eta;}
- float etaMin() const {return m_etaMin;}
- float etaMax() const {return m_etaMax;}
- float phi() const {return m_phi;}
- float phiMin() const {return m_phiMin;}
- float phiMax() const {return m_phiMax;}
- float z0() const {return m_z0;}
- float z0Min() const {return m_z0Min;}
- float z0Max() const {return m_z0Max;}
-
- const std::set<unsigned int>& firstLayer() const {return m_firstLayer;}
- const std::set<unsigned int>& secondLayer() const {return m_secondLayer;}
- const std::set<unsigned int>& thirdLayer() const {return m_thirdLayer;}
-
- const std::set<unsigned int>& layer(const roadLayer& layer) const {
- switch(layer) {
- case firstRoadLayer:
- return m_firstLayer;
- break;
- case secondRoadLayer:
- return m_secondLayer;
- break;
- case thirdRoadLayer:
- return m_thirdLayer;
- break;
- default:
- return m_thirdLayer;
- break;
- }
- }
-protected:
- unsigned int m_roadId;
- unsigned int m_roadSubId;
- // Kinematic boundaries
- float m_minPt;
- float m_maxD0;
- // Geometric boundaries
- float m_eta, m_etaMin, m_etaMax; // eta boundaries
- float m_phi, m_phiMin, m_phiMax; // phi boundaries
- float m_z0, m_z0Min, m_z0Max; // z0 boundaries
- std::set<unsigned int> m_firstLayer;
- std::set<unsigned int> m_secondLayer;
- std::set<unsigned int> m_thirdLayer;
-} TRIG_ID_ROAD;
-
-#endif
diff --git a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigL2LayerSetLUT.h b/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigL2LayerSetLUT.h
deleted file mode 100644
index 37a789cdf56e4d810c30d9c2fa265129b5865f2a..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigL2LayerSetLUT.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef __TRIG_L2_LAYER_SET_LUT_H__
-#define __TRIG_L2_LAYER_SET_LUT_H__
-
-#include<cstring>
-
-typedef struct TrigL2LayerSetLUT {
-public:
-TrigL2LayerSetLUT(float zmax, float tmax, int nbz, int nbt, int nL) :
- m_zMax(zmax), m_tMax(tmax), m_nBinZ(nbz), m_nBinTheta(nbt), m_nLayers(nL) {
- m_lut = new short[m_nBinZ*m_nBinTheta*m_nLayers];
- memset(m_lut, 0, sizeof(short)*m_nBinZ*m_nBinTheta*m_nLayers);
- m_zBin = 2*m_zMax/m_nBinZ;
- m_tBin = 2*m_tMax/m_nBinTheta;
- m_nBZ = (m_nBinZ-1)/2;
- m_nBT = (m_nBinTheta-1)/2;
-}
- ~TrigL2LayerSetLUT() {
- delete[] m_lut;
- }
- bool addSet(const short& src, float z, float t) {
-
- int zbin = (fabs(z)<=m_zBin) ? 0 : 1+(int)(fabs(z)/m_zBin-0.5);
- if(z<0.0) zbin = -zbin;
- int tbin = (fabs(t)<=m_tBin) ? 0 : 1+(int)(fabs(t)/m_tBin-0.5);
- if(t<0.0) tbin = -tbin;
-
- if(abs(zbin)>m_nBZ) return false;
- if(abs(tbin)>m_nBT) return false;
- int idx = m_nLayers*(tbin+m_nBT+(zbin+m_nBZ)*m_nBinTheta);
- memcpy(&m_lut[idx], &src, sizeof(short)*m_nLayers);
- return true;
- }
- const short* getSet(float z, float t) const {
- int zbin = (fabs(z)<=m_zBin) ? 0 : 1+(int)(fabs(z)/m_zBin-0.5);
- if(z<0.0) zbin = -zbin;
- int tbin = (fabs(t)<=m_tBin) ? 0 : 1+(int)(fabs(t)/m_tBin-0.5);
- if(t<0.0) tbin = -tbin;
- if(abs(zbin)>m_nBZ) return NULL;
- if(abs(tbin)>m_nBT) return NULL;
- int idx = m_nLayers*(tbin+m_nBT+(zbin+m_nBZ)*m_nBinTheta);
- return &m_lut[idx];
- }
-
- float m_zMax, m_tMax;
- int m_nBinZ, m_nBinTheta, m_nLayers, m_nBT, m_nBZ;
- float m_zBin, m_tBin;
- short* m_lut;
-private:
-TrigL2LayerSetLUT() : m_lut(NULL) {};
-} TRIG_L2_LAYER_SET_LUT;
-
-
-#endif
diff --git a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigL2TimeoutException.h b/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigL2TimeoutException.h
deleted file mode 100644
index 1c749778c403b4f27800f1ca9ae949ba5d4cf113..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigL2TimeoutException.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef __TRIG_L2_TIMEOUT_EXCEPTION_H__
-#define __TRIG_L2_TIMEOUT_EXCEPTION_H__
-
-class TrigL2TimeoutException {
- public:
- TrigL2TimeoutException(int s) : m_stage(s) {};
- TrigL2TimeoutException() : m_stage(0) {};
- virtual ~TrigL2TimeoutException() {};
- int m_stage;
-};
-
-#endif
diff --git a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigSpacePointStorage.h b/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigSpacePointStorage.h
deleted file mode 100644
index 7e7ecb0a06f2a0ea5693d97326b229164aee2fb6..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigInDetPattRecoEvent/TrigInDetPattRecoEvent/TrigSpacePointStorage.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef __TRIG_SPACE_POINT_STORAGE_H__
-#define __TRIG_SPACE_POINT_STORAGE_H__
-#include <map>
-#include <utility>
-#include <vector>
-#include "TrigInDetPattRecoEvent/TrigInDetRoad.h"
-
-class TrigSiSpacePointBase;
-
-struct TrigL2TripletSpacePointVector {
- std::vector<const TrigSiSpacePointBase*> m_spacePointFirstLayerVector;
- std::vector<const TrigSiSpacePointBase*> m_spacePointSecondLayerVector;
- std::vector<const TrigSiSpacePointBase*> m_spacePointThirdLayerVector;
-};
-
-class TrigSpacePointStorage {
- public:
- TrigSpacePointStorage() : m_empty(std::vector<const TrigSiSpacePointBase*>(0)) {};
- void fill(const unsigned int& roadId, const unsigned int& roadSubId, const TrigSiSpacePointBase& spacePoint, const TrigInDetRoad::roadLayer& spLayer);
-
- const std::vector<const TrigSiSpacePointBase*>& spacePointVector(const unsigned int& roadId, const unsigned int& roadSubId, const TrigInDetRoad::roadLayer& layer) const;
- const std::vector<const TrigSiSpacePointBase*>& firstLayerSpacePointVector(const unsigned int& roadId, const unsigned int& roadSubId) const;
- const std::vector<const TrigSiSpacePointBase*>& secondLayerSpacePointVector(const unsigned int& roadId, const unsigned int& roadSubId) const;
- const std::vector<const TrigSiSpacePointBase*>& thirdLayerSpacePointVector(const unsigned int& roadId, const unsigned int& roadSubId) const;
- private:
- std::map<std::pair<unsigned int, unsigned int>, TrigL2TripletSpacePointVector> m_spacePointRoadMap;
- std::vector<const TrigSiSpacePointBase*> m_empty;
-};
-
-#endif
diff --git a/Trigger/TrigEvent/TrigInDetPattRecoEvent/src/TrigSpacePointStorage.cxx b/Trigger/TrigEvent/TrigInDetPattRecoEvent/src/TrigSpacePointStorage.cxx
deleted file mode 100644
index 48f539f2fa2d56ef8f01d5c8cd750e5120dbb6b4..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigInDetPattRecoEvent/src/TrigSpacePointStorage.cxx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef __TRIG_SPACEPOINT_STORAGE_CXX__
-#define __TRIG_SPACEPOINT_STORAGE_CXX__
-#include "TrigInDetPattRecoEvent/TrigSpacePointStorage.h"
-#include <iostream>
-
-void TrigSpacePointStorage::fill(const unsigned int& roadId, const unsigned int& roadSubId, const TrigSiSpacePointBase& spacePoint,
- const TrigInDetRoad::roadLayer& spLayer) {
- //std::cout << "SMH: In TrigSpacePointStorage::fill() spLayer: " << spLayer << std::endl;
- //std::cout << "SMH: roadId: " << roadId << std::endl;
- std::pair<unsigned int, unsigned int> roadFullId = std::make_pair(roadId, roadSubId);
- if (spLayer == TrigInDetRoad::firstRoadLayer){
- m_spacePointRoadMap[roadFullId].m_spacePointFirstLayerVector.push_back(&spacePoint);
- //std::cout << "SMH: In TrigSpacePointStorage::fill() FirstLayer: " << std::endl;
- //std::cout << "SMH: FirstLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointFirstLayerVector.size() << std::endl;
- //std::cout << "SMH: SecondLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointSecondLayerVector.size() << std::endl;
- //std::cout << "SMH: ThirdLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointThirdLayerVector.size() << std::endl;
- }
- else if (spLayer == TrigInDetRoad::secondRoadLayer){
- m_spacePointRoadMap[roadFullId].m_spacePointSecondLayerVector.push_back(&spacePoint);
- //std::cout << "SMH: In TrigSpacePointStorage::fill() SecondLayer: " << std::endl;
- //std::cout << "SMH: FirstLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointFirstLayerVector.size() << std::endl;
- //std::cout << "SMH: SecondLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointSecondLayerVector.size() << std::endl;
- //std::cout << "SMH: ThirdLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointThirdLayerVector.size() << std::endl;
- }
- else if (spLayer == TrigInDetRoad::thirdRoadLayer) {
- m_spacePointRoadMap[roadFullId].m_spacePointThirdLayerVector.push_back(&spacePoint);
- //std::cout << "SMH: In TrigSpacePointStorage::fill() ThirdLayer: " << std::endl;
- //std::cout << "SMH: FirstLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointFirstLayerVector.size() << std::endl;
- //std::cout << "SMH: SecondLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointSecondLayerVector.size() << std::endl;
- //std::cout << "SMH: ThirdLayerVector.size(): " << m_spacePointRoadMap[roadFullId].m_spacePointThirdLayerVector.size() << std::endl;
- }
-}
-
-const std::vector<const TrigSiSpacePointBase*>& TrigSpacePointStorage::spacePointVector(const unsigned int& roadId,
- const unsigned int& roadSubId, const TrigInDetRoad::roadLayer& layer) const {
- std::pair<unsigned int, unsigned int> roadFullId = std::make_pair(roadId, roadSubId);
- auto spacePointRoadMapIter = m_spacePointRoadMap.find(roadFullId);
- if (spacePointRoadMapIter != m_spacePointRoadMap.end()) {
- if (layer == TrigInDetRoad::firstRoadLayer){
- //return &(spacePointRoadMapIter->second.m_spacePointFirstLayerVector);
- return (m_spacePointRoadMap.at(roadFullId).m_spacePointFirstLayerVector);
- }
- else if (layer == TrigInDetRoad::secondRoadLayer){
- //return &(spacePointRoadMapIter->second.m_spacePointSecondLayerVector);
- return (m_spacePointRoadMap.at(roadFullId).m_spacePointSecondLayerVector);
- }
- else if (layer == TrigInDetRoad::thirdRoadLayer){
- //return &(spacePointRoadMapIter->second.m_spacePointThirdLayerVector);
- return (m_spacePointRoadMap.at(roadFullId).m_spacePointThirdLayerVector);
- }
- }
- return m_empty;
-}
-
-const std::vector<const TrigSiSpacePointBase*>& TrigSpacePointStorage::firstLayerSpacePointVector(const unsigned int& roadId, const unsigned int& roadSubId) const {
- return spacePointVector(roadId, roadSubId, TrigInDetRoad::firstRoadLayer);
-}
-const std::vector<const TrigSiSpacePointBase*>& TrigSpacePointStorage::secondLayerSpacePointVector(const unsigned int& roadId, const unsigned int& roadSubId) const {
- return spacePointVector(roadId, roadSubId, TrigInDetRoad::secondRoadLayer);
-}
-const std::vector<const TrigSiSpacePointBase*>& TrigSpacePointStorage::thirdLayerSpacePointVector(const unsigned int& roadId, const unsigned int& roadSubId) const {
- return spacePointVector(roadId, roadSubId, TrigInDetRoad::thirdRoadLayer);
-}
-
-#endif
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.h
old mode 100644
new mode 100755
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/src/HLTJetMonTool.h b/Trigger/TrigMonitoring/TrigJetMonitoring/src/HLTJetMonTool.h
old mode 100644
new mode 100755
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.h b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/src/HLTMinBiasMonTool.h
old mode 100644
new mode 100755
diff --git a/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigInDetRoadMakerTool.h b/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigInDetRoadMakerTool.h
deleted file mode 100755
index c1367c57b4be1fdeac9b9bb1d1cbfad02ba974e3..0000000000000000000000000000000000000000
--- a/Trigger/TrigTools/TrigInDetToolInterfaces/TrigInDetToolInterfaces/ITrigInDetRoadMakerTool.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef __ITRIGINDETROADMAKERTOOL_H__
-#define __ITRIGINDETROADMAKERTOOL_H__
-
-#include <vector>
-#include "GaudiKernel/IAlgTool.h"
-#include "TrigSteeringEvent/Enums.h"
-
-class IRoiDescriptor;
-class TrigInDetRoad;
-
-
-static const InterfaceID IID_ITrigInDetRoadMakerTool("ITrigInDetRoadMakerTool", 1 , 0);
-
-
-class ITrigInDetRoadMakerTool: virtual public IAlgTool {
-
- public:
-
- static const InterfaceID& interfaceID() {
- return IID_ITrigInDetRoadMakerTool;
- }
-
- virtual StatusCode makeRoads(std::vector<TrigInDetRoad>&, const IRoiDescriptor* ) = 0;
-
-};
-
-#endif
-
-