From a077b966bc38e33d5ca0835f05f9e82e3fe4fc3f Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Tue, 2 Oct 2018 15:37:34 +0200 Subject: [PATCH] MuonD3PDMaker: Remove TriggerObject association tools. Remove remaining remnants of Run 1 EDM. --- .../src/EFInfoMuonKinematicsFiller.cxx | 102 ------------------ .../src/EFInfoMuonKinematicsFiller.h | 89 --------------- .../MuonD3PDMaker/src/EFMuonFillerTool.cxx | 63 ----------- .../MuonD3PDMaker/src/EFMuonFillerTool.h | 64 ----------- .../MuonD3PDMaker/src/L2MuonCB1FillerTool.cxx | 88 --------------- .../MuonD3PDMaker/src/L2MuonCB1FillerTool.h | 67 ------------ .../MuonD3PDMaker/src/L2MuonCB2FillerTool.cxx | 73 ------------- .../MuonD3PDMaker/src/L2MuonCB2FillerTool.h | 75 ------------- ...MuonEFInfoTriggerObjectAssociationTool.cxx | 49 --------- .../MuonEFInfoTriggerObjectAssociationTool.h | 67 ------------ .../MuonEFTriggerObjectAssociationTool.cxx | 34 ------ .../src/MuonEFTriggerObjectAssociationTool.h | 56 ---------- .../MuonL1TriggerObjectAssociationTool.cxx | 39 ------- .../src/MuonL1TriggerObjectAssociationTool.h | 54 ---------- .../MuonL2TriggerObjectAssociationTool.cxx | 42 -------- .../src/MuonL2TriggerObjectAssociationTool.h | 54 ---------- .../src/components/MuonD3PDMaker_entries.cxx | 16 --- 17 files changed, 1032 deletions(-) delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.h delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.h delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.cxx delete mode 100644 PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.h diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.cxx deleted file mode 100644 index 78eb19c2d882..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.cxx +++ /dev/null @@ -1,102 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for TrigMuonEFInfo, detail level 1 - */ - -#include "D3PDMakerUtils/BlockFillerTool.h" -#include "EFInfoMuonKinematicsFiller.h" -#include "TrigMuonEvent/TrigMuonEFInfo.h" -#include "TrigMuonEvent/TrigMuonEFTrack.h" -#include "TrigMuonEvent/TrigMuonEFCbTrack.h" -#include "TrigMuonEvent/TrigMuonEFInfoTrack.h" -#include "TrigMuonEvent/TrigMuonEFInfoTrackContainer.h" - -#include "AthenaKernel/errorcheck.h" - - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -EFInfoMuonKinematicsFiller::EFInfoMuonKinematicsFiller - (const std::string& type, - const std::string& name, - const IInterface* parent) - : BlockFillerTool<TrigMuonEFInfo> (type, name, parent) -{ - book().ignore(); // Avoid coverity warnings. -} - - -/** - * @brief Book variables for this block. - */ -StatusCode EFInfoMuonKinematicsFiller::book() -{ - CHECK( addVariable ("cb_eta", m_cb_eta) ); - CHECK( addVariable ("cb_phi", m_cb_phi) ); - CHECK( addVariable ("cb_pt" , m_cb_pt) ); - - CHECK( addVariable ("ms_eta", m_ms_eta) ); - CHECK( addVariable ("ms_phi", m_ms_phi) ); - CHECK( addVariable ("ms_pt" , m_ms_pt) ); - - CHECK( addVariable ("me_eta", m_me_eta) ); - CHECK( addVariable ("me_phi", m_me_phi) ); - CHECK( addVariable ("me_pt" , m_me_pt) ); - - // CHECK( addVariable ("etadiff", m_etadiff) ); - // CHECK( addVariable ("phidiff", m_phidiff) ); - - return StatusCode::SUCCESS; -} - - -/** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ -StatusCode EFInfoMuonKinematicsFiller::fill (const TrigMuonEFInfo& p) -{ - const TrigMuonEFInfoTrackContainer* tracks = p.TrackContainer(); - if (tracks && !tracks->empty()) { - const TrigMuonEFInfoTrack* t = tracks->front(); - if (t) { - const TrigMuonEFCbTrack* cbtrk = t->CombinedTrack(); - *m_cb_eta = (cbtrk ? cbtrk->eta() : -10); - *m_cb_phi = (cbtrk ? cbtrk->phi() : -10); - *m_cb_pt = (cbtrk && cbtrk->iPt()!= 0 ? cbtrk->pt() : -1.e9); - - const TrigMuonEFTrack* mstrk = t->SpectrometerTrack(); - *m_ms_eta = (mstrk ? mstrk->eta() : -10); - *m_ms_phi = (mstrk ? mstrk->phi() : -10); - *m_ms_pt = (mstrk ? mstrk->pt() : -1.e9); - - const TrigMuonEFTrack* metrk = t->ExtrapolatedTrack(); - *m_me_eta = (metrk ? metrk->eta() : -10); - *m_me_phi = (metrk ? metrk->phi() : -10); - *m_me_pt = (metrk ? metrk->pt() : -1.e9); - } - } - - return StatusCode::SUCCESS; -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.h deleted file mode 100644 index ab8e07af3139..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/EFInfoMuonKinematicsFiller.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for TrigMuonEFInfo, detail level 1 - */ - -#ifndef MUOND3PDMAKER_EFINFOMUONKINEMATICSFILLER_H -#define MUOND3PDMAKER_EFINFOMUONKINEMATICSFILLER_H 1 - - -#include "D3PDMakerUtils/BlockFillerTool.h" -class TrigMuonEFInfo; - - -namespace D3PD { - - -/** - * @brief Block filler tool for TrigMuonEF - */ -class EFInfoMuonKinematicsFiller - : public BlockFillerTool<TrigMuonEFInfo> -{ -public: - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - EFInfoMuonKinematicsFiller (const std::string& type, - const std::string& name, - const IInterface* parent); - - - /// Book variables for this block. - virtual StatusCode book(); - - - /** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ - virtual StatusCode fill (const TrigMuonEFInfo& p); - - -private: - /// Combined trigger track kinematics - /// Variable: pt combined - float* m_cb_pt; - /// Variable: eta combined - float* m_cb_eta; - /// Variable: phi combined - float* m_cb_phi; - - /// MS trigger track kinematics - /// Variable: pt combined - float* m_ms_pt; - /// Variable: eta combined - float* m_ms_eta; - /// Variable: phi combined - float* m_ms_phi; - - /// extrapolated MS trigger track kinematics - /// Variable: pt combined - float* m_me_pt; - /// Variable: eta combined - float* m_me_eta; - /// Variable: phi combined - float* m_me_phi; - - - - -}; - - -} - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.cxx deleted file mode 100644 index 0a587136efb7..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.cxx +++ /dev/null @@ -1,63 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/EFMuonFillerTool.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for TrigMuonEF - */ - -#include "D3PDMakerUtils/BlockFillerTool.h" -#include "EFMuonFillerTool.h" -#include "TrigMuonEvent/TrigMuonEF.h" -#include "AthenaKernel/errorcheck.h" - - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -EFMuonFillerTool::EFMuonFillerTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : BlockFillerTool<TrigMuonEF> (type, name, parent) -{ - book().ignore(); // Avoid coverity warnings. -} - - -/** - * @brief Book variables for this block. - */ -StatusCode EFMuonFillerTool::book() -{ - CHECK( addVariable ("muoncode", m_muonCode) ); - return StatusCode::SUCCESS; -} - - -/** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ -StatusCode EFMuonFillerTool::fill (const TrigMuonEF& p) -{ - *m_muonCode = p.MuonCode(); - return StatusCode::SUCCESS; -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.h deleted file mode 100644 index 2125d02a529b..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/EFMuonFillerTool.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/EFMuonFillerTool.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for TrigMuonEF - */ - -#ifndef MUOND3PDMAKER_EFMUONFILLERTOOL_H -#define MUOND3PDMAKER_EFMUONFILLERTOOL_H 1 - - -#include "D3PDMakerUtils/BlockFillerTool.h" -class TrigMuonEF; - - -namespace D3PD { - - -/** - * @brief Block filler tool for TrigMuonEF - */ -class EFMuonFillerTool - : public BlockFillerTool<TrigMuonEF> -{ -public: - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - EFMuonFillerTool (const std::string& type, - const std::string& name, - const IInterface* parent); - - - /// Book variables for this block. - virtual StatusCode book(); - - - /** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ - virtual StatusCode fill (const TrigMuonEF& p); - - -private: - /// Variable: muon code - int* m_muonCode; -}; - - -} - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.cxx deleted file mode 100644 index a677dbf7b48c..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.cxx +++ /dev/null @@ -1,88 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/L2MuonCB1FillerTool.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for CombinedMuonFeature charge, detail level 1 - */ - -#include "L2MuonCB1FillerTool.h" -#include "TrigMuonEvent/CombinedMuonFeature.h" -#include "TrigMuonEvent/MuonFeature.h" -#include "TrigInDetEvent/TrigInDetTrack.h" -#include "TrigInDetEvent/TrigInDetTrackFitPar.h" -#include "AthenaKernel/errorcheck.h" - - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -L2MuonCB1FillerTool::L2MuonCB1FillerTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : BlockFillerTool<CombinedMuonFeature> (type, name, parent) -{ - book().ignore(); // Avoid coverity warnings. -} - - -/** - * @brief Book variables for this block. - */ -StatusCode L2MuonCB1FillerTool::book() -{ - CHECK( addVariable ("id_pt" , m_id_pt) ); - CHECK( addVariable ("ms_pt" , m_ms_pt) ); - - return StatusCode::SUCCESS; -} - - -/** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ -StatusCode L2MuonCB1FillerTool::fill (const CombinedMuonFeature& p) -{ - const TrigInDetTrack* idtrk = p.IDTrack(); - const MuonFeature* mstrk = p.muFastTrack(); - const TrigInDetTrackFitPar* idfp = 0; - - //double ideta = 100; - //double idphi = 100; - - if(idtrk) idfp = idtrk->param(); - if(idfp) { - *m_id_pt = idfp->pT(); - //ideta = idfp->eta(); - //idphi = idfp->phi0(); - } else { - *m_id_pt = -1.e9; // momenta are signed...small values not obviously junk. 1 PeV :) - } - - if(mstrk) { - *m_ms_pt = mstrk->pt() ; - }else { - *m_ms_pt = -1.e9; - } - - return StatusCode::SUCCESS; -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.h deleted file mode 100644 index 86b5ed511feb..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB1FillerTool.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/L2MuonCB1FillerTool.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for CombinedMuonFeature, detail level 1 - */ - -#ifndef MUOND3PDMAKER_L2MUONCB1FILLERTOOL_H -#define MUOND3PDMAKER_L2MUONCB1FILLERTOOL_H - - -#include "D3PDMakerUtils/BlockFillerTool.h" -class CombinedMuonFeature; - - -namespace D3PD { - - -/** - * @brief Block filler tool for CombinedMuonFeature detail level 1. - */ -class L2MuonCB1FillerTool - : public BlockFillerTool<CombinedMuonFeature> -{ -public: - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - L2MuonCB1FillerTool (const std::string& type, - const std::string& name, - const IInterface* parent); - - - /// Book variables for this block. - virtual StatusCode book(); - - - /** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ - virtual StatusCode fill (const CombinedMuonFeature& p); - - -private: - /// Variable: pt of ID track - float* m_id_pt; - /// Variable: pt of MuFast track - float* m_ms_pt; -}; - - -} // namespace D3PD - - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.cxx deleted file mode 100644 index b670bf469198..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.cxx +++ /dev/null @@ -1,73 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/L2MuonCB2FillerTool.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for CombinedMuonFeature charge, detail level 2 - * - * ??? This should be changed to operate on TrigInDetTrack and - * moved to TriggerD3PDMaker. - */ - -#include "L2MuonCB2FillerTool.h" -#include "TrigMuonEvent/CombinedMuonFeature.h" -#include "TrigInDetEvent/TrigInDetTrack.h" -#include "AthenaKernel/errorcheck.h" - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -L2MuonCB2FillerTool::L2MuonCB2FillerTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : BlockFillerTool<CombinedMuonFeature> (type, name, parent) -{ - book().ignore(); // Avoid coverity warnings. -} - - -/** - * @brief Book variables for this block. - */ -StatusCode L2MuonCB2FillerTool::book() -{ - CHECK( addVariable ("nPixHits" , m_NPixelSpacePoints) ); - CHECK( addVariable ("nSCTHits" , m_NSCT_SpacePoints) ); - CHECK( addVariable ("nTRTHits" , m_NStrawHits) ); - CHECK( addVariable ("nTRTHighTHits" , m_NTRHits) ); - - return StatusCode::SUCCESS; -} - - -/** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ -StatusCode L2MuonCB2FillerTool::fill (const CombinedMuonFeature& p) -{ - const TrigInDetTrack* idtrk = p.IDTrack(); - *m_NPixelSpacePoints = (idtrk ? idtrk->NPixelSpacePoints() : -999); - *m_NSCT_SpacePoints = (idtrk ? idtrk->NSCT_SpacePoints() : -999); - *m_NStrawHits = (idtrk ? idtrk->NStrawHits() : -999); - *m_NTRHits = (idtrk ? idtrk->NTRHits() : -999); - return StatusCode::SUCCESS; -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.h deleted file mode 100644 index 06fec0a40096..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/L2MuonCB2FillerTool.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/L2MuonCB2FillerTool.h - * @author srivas prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Block filler tool for CombinedMuonFeature, detail level 2 - */ - -#ifndef MUOND3PDMAKER_L2MUONCB2FILLERTOOL_H -#define MUOND3PDMAKER_L2MUONCB2FILLERTOOL_H - - -#include "D3PDMakerUtils/BlockFillerTool.h" -class CombinedMuonFeature; - - -namespace D3PD { - - -/** - * @brief Block filler tool for CombinedMuonFeature, detail level 2 - */ -class L2MuonCB2FillerTool - : public BlockFillerTool<CombinedMuonFeature> -{ -public: - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - L2MuonCB2FillerTool (const std::string& type, - const std::string& name, - const IInterface* parent); - - - /// Book variables for this block. - virtual StatusCode book(); - - - /** - * @brief Fill one block --- type-safe version. - * @param p The input object. - * - * This is called once per object. The caller - * is responsible for arranging that all the pointers for booked variables - * are set appropriately upon entry. - */ - virtual StatusCode fill (const CombinedMuonFeature& p); - - -private: - /// Variable: number of pixel space points for ID track - int* m_NPixelSpacePoints; - - /// Variable: number of SCT space points for ID track - int* m_NSCT_SpacePoints; - - /// Variable: number of straw hits for ID track - int* m_NStrawHits; - - /// Variable: number of high-threshold hits for ID track - int* m_NTRHits; - -}; - - -} // namespace D3PD - - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.cxx deleted file mode 100644 index 066e6d31f775..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.cxx +++ /dev/null @@ -1,49 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching Event Filter trigger object. - */ - - -#include "MuonEFInfoTriggerObjectAssociationTool.h" - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -MuonEFInfoTriggerObjectAssociationTool::MuonEFInfoTriggerObjectAssociationTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : Base (type, name, parent) -{ - declareProperty("EFTrigMatchType", m_efTrigMatchType); // CB or MS or ME or MG -} - -///const HepMC::GenParticle* -///MuonGenParticleAssociationTool::get (const Analysis::Muon& p) -///{ - -const TrigMuonEFInfo* MuonEFInfoTriggerObjectAssociationTool::get(const Analysis::Muon& p) { - if(m_efTrigMatchType=="CB") TrigMatch::TrigMuonEFInfoHelper::setTrackToUse(TrigMatch::useCombinedTrack); - else if(m_efTrigMatchType=="MS") TrigMatch::TrigMuonEFInfoHelper::setTrackToUse(TrigMatch::useSpectrometerTrack); - else if(m_efTrigMatchType=="ME") TrigMatch::TrigMuonEFInfoHelper::setTrackToUse(TrigMatch::useExtrapolatedTrack); - else if(m_efTrigMatchType=="MG") TrigMatch::TrigMuonEFInfoHelper::setTrackToUse(TrigMatch::useMuGirlTrack); - else REPORT_MESSAGE(MSG::ERROR) << "MuonD3PDMaker::MuonEFInfoTriggerObjectAssociationTool: bad trigger match type"; - - return Base::get(p); - -} - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.h deleted file mode 100644 index d6761371cc1d..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonEFInfoTriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching Event Filter trigger object (TrigMuonEFInfo) - */ - -#ifndef MUOND3PDMAKER_MUONEFINFOTRIGGEROBJECTASSOCIATIONTOOL_H -#define MUOND3PDMAKER_MUONEFINFOTRIGGEROBJECTASSOCIATIONTOOL_H 1 - - -#include "TriggerD3PDMaker/TriggerObjectAssociationTool.h" -#include "muonEvent/Muon.h" -#include "muonEvent/MuonContainer.h" -#include "TrigMuonEvent/TrigMuonEFInfo.h" -#include "TrigMuonEvent/TrigMuonEFInfoContainer.h" -#include "TrigObjectMatching/TrigMuonEFInfoDistanceFunctor.h" -//#include Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfo.h" -#include <string> - - - -namespace D3PD { - - -/** - * @brief Associate from an Analysis::Muon to matching Event Filter trigger object. - */ - typedef TriggerObjectAssociationTool<Analysis::Muon, TrigMuonEFInfo> - MuonEFInfoTriggerObjectAssociationToolBase; - -class MuonEFInfoTriggerObjectAssociationTool - : public MuonEFInfoTriggerObjectAssociationToolBase -{ -public: - typedef MuonEFInfoTriggerObjectAssociationToolBase Base; - - - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - MuonEFInfoTriggerObjectAssociationTool (const std::string& type, - const std::string& name, - const IInterface* parent); - - virtual const TrigMuonEFInfo* get(const Analysis::Muon& p); - -private: - // EFInfo track type to match to. Can be (muid) combined, mugirl, muon spectrometer, or extrapolated track - // see Trigger/TrigAnalysis/TrigObjectMatching/TrigObjectMatching/TrigMuonEFInfoDistanceFunctor.h - // and Trigger/TrigEvent/TrigMuonEvent/TrigMuonEvent/TrigMuonEFInfo.h - std::string m_efTrigMatchType; -}; - - -} // namespace D3PD - - - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.cxx deleted file mode 100644 index ef789cdb2133..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.cxx +++ /dev/null @@ -1,34 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching Event Filter trigger object. - */ - - -#include "MuonEFTriggerObjectAssociationTool.h" - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -MuonEFTriggerObjectAssociationTool::MuonEFTriggerObjectAssociationTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : Base (type, name, parent) -{ -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.h deleted file mode 100644 index 1a7e2498cb75..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonEFTriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching Event Filter trigger object. - */ - -#ifndef MUOND3PDMAKER_MUONEFTRIGGEROBJECTASSOCIATIONTOOL_H -#define MUOND3PDMAKER_MUONEFTRIGGEROBJECTASSOCIATIONTOOL_H 1 - - -#include "TriggerD3PDMaker/TriggerObjectAssociationTool.h" -#include "muonEvent/Muon.h" -#include "muonEvent/MuonContainer.h" -#include "TrigMuonEvent/TrigMuonEF.h" -#include "TrigMuonEvent/TrigMuonEFContainer.h" - - - -namespace D3PD { - - -/** - * @brief Associate from an Analysis::Muon to matching Event Filter trigger object. - */ - typedef TriggerObjectAssociationTool<Analysis::Muon, TrigMuonEF> - MuonEFTriggerObjectAssociationToolBase; - -class MuonEFTriggerObjectAssociationTool - : public MuonEFTriggerObjectAssociationToolBase -{ -public: - typedef MuonEFTriggerObjectAssociationToolBase Base; - - - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - MuonEFTriggerObjectAssociationTool (const std::string& type, - const std::string& name, - const IInterface* parent); -}; - - -} // namespace D3PD - - - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.cxx deleted file mode 100644 index 8dc148956dad..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.cxx +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching L1 trigger object. - */ - - -#include "MuonL1TriggerObjectAssociationTool.h" -#include "AthenaKernel/errorcheck.h" - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -MuonL1TriggerObjectAssociationTool::MuonL1TriggerObjectAssociationTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : Base (type, name, parent) -{ - if (setProperty ("ChainPattern", "L1_MU.*").isFailure()) { - REPORT_MESSAGE (MSG::ERROR) << "Can't set ChainPattern property for tool " - << type << "/" << name; - } -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.h deleted file mode 100644 index 25211e58ee0c..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonL1TriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching L1 trigger object. - */ - - -#ifndef MUOND3PDMAKER_MUONL1TRIGGEROBJECTASSOCIATIONTOOL_H -#define MUOND3PDMAKER_MUONL1TRIGGEROBJECTASSOCIATIONTOOL_H - - -#include "TriggerD3PDMaker/TriggerObjectAssociationTool.h" -#include "AnalysisTriggerEvent/Muon_ROI.h" -#include "muonEvent/Muon.h" - - -namespace D3PD { - - -/** - * @brief Associate from an Analysis::Muon to matching L1 trigger object. - */ - typedef TriggerObjectAssociationTool<Analysis::Muon, Muon_ROI> - MuonL1TriggerObjectAssociationToolBase; - -class MuonL1TriggerObjectAssociationTool - : public MuonL1TriggerObjectAssociationToolBase -{ -public: - typedef MuonL1TriggerObjectAssociationToolBase Base; - - - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - MuonL1TriggerObjectAssociationTool (const std::string& type, - const std::string& name, - const IInterface* parent); -}; - - -} // namespace D3PD - - - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.cxx deleted file mode 100644 index 25df931410aa..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.cxx +++ /dev/null @@ -1,42 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching L2 trigger object. - */ - - -#include "MuonL2TriggerObjectAssociationTool.h" -#include "SGTools/BaseInfo.h" - - -SG_ADD_BASE(CombinedMuonFeature, SG_VIRTUAL(INavigable4Momentum)); - - -namespace D3PD { - - -/** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ -MuonL2TriggerObjectAssociationTool::MuonL2TriggerObjectAssociationTool - (const std::string& type, - const std::string& name, - const IInterface* parent) - : Base (type, name, parent) -{ - if (setProperty ("ChainPattern", "L2_mu.*").isFailure()) { - REPORT_MESSAGE (MSG::ERROR) << "Can't set ChainPattern property for tool " - << type << "/" << name; - } -} - - -} // namespace D3PD diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.h b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.h deleted file mode 100644 index 56a9717aefba..000000000000 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** - * @file MuonD3PDMaker/src/MuonL2TriggerObjectAssociationTool.h - * @author Srivas Prasad <srivas.prasad@cern.ch> - * @date Jan 2010 - * @brief Associate from an Analysis::Muon to matching L2 trigger object. - */ - - -#ifndef MUOND3PDMAKER_MUONL2TRIGGEROBJECTASSOCIATIONTOOL_H -#define MUOND3PDMAKER_MUONL2TRIGGEROBJECTASSOCIATIONTOOL_H - - -#include "TriggerD3PDMaker/TriggerObjectAssociationTool.h" -#include "muonEvent/Muon.h" -#include "TrigMuonEvent/CombinedMuonFeature.h" -#include "TrigMuonEvent/CombinedMuonFeatureContainer.h" - -namespace D3PD { - - -/** - * @brief Associate from a muon to its matching L2 trigger object. - */ - typedef TriggerObjectAssociationTool<Analysis::Muon, CombinedMuonFeature> - MuonL2TriggerObjectAssociationToolBase; - -class MuonL2TriggerObjectAssociationTool - : public MuonL2TriggerObjectAssociationToolBase -{ -public: - typedef MuonL2TriggerObjectAssociationToolBase Base; - - - /** - * @brief Standard Gaudi tool constructor. - * @param type The name of the tool type. - * @param name The tool name. - * @param parent The tool's Gaudi parent. - */ - MuonL2TriggerObjectAssociationTool (const std::string& type, - const std::string& name, - const IInterface* parent); -}; - - -} // namespace D3PD - - - -#endif diff --git a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx index 946b08e7f41d..c28d6f28368e 100644 --- a/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx +++ b/PhysicsAnalysis/D3PDMaker/MuonD3PDMaker/src/components/MuonD3PDMaker_entries.cxx @@ -1,15 +1,7 @@ #include "../MuonTrkHitFillerTool.h" //Serhan #include "../MuonNumberOfSegmentsFillerTool.h" #include "../MuonTrackParticleAssociationTool.h" -#include "../MuonL1TriggerObjectAssociationTool.h" // Srivas -#include "../MuonL2TriggerObjectAssociationTool.h" // Srivas -#include "../MuonEFTriggerObjectAssociationTool.h" // Srivas -#include "../MuonEFInfoTriggerObjectAssociationTool.h" // Srivas -#include "../L2MuonCB1FillerTool.h" // Srivas -#include "../L2MuonCB2FillerTool.h" // Srivas -#include "../EFMuonFillerTool.h" // Srivas #include "../MuonGenParticleAssociationTool.h" -#include "../EFInfoMuonKinematicsFiller.h" // Srivas #include "../MuonSegmentAuthorFillerTool.h" // Srivas #include "../MuonSegmentLocationFillerTool.h" // Srivas #include "../MuonSegmentFitQualityFillerTool.h" // Srivas @@ -39,15 +31,7 @@ DECLARE_COMPONENT( D3PD::MuonTrkHitFillerTool ) // Serhan DECLARE_COMPONENT( D3PD::MuonNumberOfSegmentsFillerTool ) DECLARE_COMPONENT( D3PD::MuonTrackParticleAssociationTool ) -DECLARE_COMPONENT( D3PD::MuonL1TriggerObjectAssociationTool ) // Srivas -DECLARE_COMPONENT( D3PD::MuonL2TriggerObjectAssociationTool ) // Srivas -DECLARE_COMPONENT( D3PD::MuonEFTriggerObjectAssociationTool ) // Srivas -DECLARE_COMPONENT( D3PD::MuonEFInfoTriggerObjectAssociationTool ) // Srivas -DECLARE_COMPONENT( D3PD::L2MuonCB1FillerTool ) // Srivas -DECLARE_COMPONENT( D3PD::L2MuonCB2FillerTool ) // Srivas -DECLARE_COMPONENT( D3PD::EFMuonFillerTool ) // Srivas DECLARE_COMPONENT( D3PD::MuonGenParticleAssociationTool ) -DECLARE_COMPONENT( D3PD::EFInfoMuonKinematicsFiller ) // Srivas DECLARE_COMPONENT( D3PD::MuonSegmentAuthorFillerTool ) // Srivas DECLARE_COMPONENT( D3PD::MuonSegmentLocationFillerTool ) // Srivas DECLARE_COMPONENT( D3PD::MuonSegmentFitQualityFillerTool ) // Srivas -- GitLab