diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/CMakeLists.txt index 8b345cd116346d0344fe9a2261d0881528fd43f8..4f1dc282a74f9bc3a7d8e0b89f387869b1ae73da 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/CMakeLists.txt +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/CMakeLists.txt @@ -18,11 +18,11 @@ atlas_add_library( MuonDQAUtilsLib INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} - LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps EventKernel GaudiKernel ParticleEvent AnalysisTriggerEvent JetTagEvent JetEvent muonEvent Particle egammaEvent LWHists TrigMuonEvent TrigSteeringEvent StoreGateLib + LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps EventKernel GaudiKernel ParticleEvent AnalysisTriggerEvent JetEvent muonEvent Particle egammaEvent LWHists TrigMuonEvent TrigSteeringEvent StoreGateLib PRIVATE_LINK_LIBRARIES ${CLHEP_LIBRARIES} ) atlas_add_component( MuonDQAUtils src/components/*.cxx INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib EventKernel GaudiKernel ParticleEvent AnalysisTriggerEvent JetTagEvent JetEvent muonEvent Particle egammaEvent LWHists TrigMuonEvent TrigSteeringEvent MuonDQAUtilsLib ) + LINK_LIBRARIES ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AthenaBaseComps StoreGateLib EventKernel GaudiKernel ParticleEvent AnalysisTriggerEvent JetEvent muonEvent Particle egammaEvent LWHists TrigMuonEvent TrigSteeringEvent MuonDQAUtilsLib ) diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h index d85ef58df85947f6a1c2a57c1b9d4efaaf182d2b..09295e685af094986d17f510b2b9c8c67ab6fa01 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InnerDetProbeCollectorTool.h @@ -33,9 +33,7 @@ /// common implementation of all particles #include "ParticleEvent/ParticleBaseContainer.h" /// particle jets -#include "JetTagEvent/JetConstituent.h" #include "JetEvent/JetCollection.h" -#include "JetTagEvent/TrackConstituents.h" #include "MuonDQAUtils/IProbeCollectorTool.h" #include "MuonDQAUtils/IInsituTrackTools.h" diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h index 7d05fd36f00bf90853cc4604d9f9ea72b022dacd..0e81a6d7aa8c3c39ac629ac40997e205c0a3e66b 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/InsituTrackTools.h @@ -33,9 +33,7 @@ /// common implementation of all particles #include "ParticleEvent/ParticleBaseContainer.h" /// particle jets -#include "JetTagEvent/JetConstituent.h" #include "JetEvent/JetCollection.h" -#include "JetTagEvent/TrackConstituents.h" #include "EventKernel/INavigable4Momentum.h" #include "MuonDQAUtils/IInsituTrackTools.h" diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h index 74808063ff96dd170fb074fa731bb8251b7382e5..98783752442897de99b0e030cc897edf3baf2541 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAUtils/MuonDQAUtils/MuonSpectrometerProbeCollectorTool.h @@ -33,9 +33,7 @@ /// common implementation of all particles #include "ParticleEvent/ParticleBaseContainer.h" /// particle jets -#include "JetTagEvent/JetConstituent.h" #include "JetEvent/JetCollection.h" -#include "JetTagEvent/TrackConstituents.h" #include "MuonDQAUtils/IProbeCollectorTool.h" #include "MuonDQAUtils/IInsituTrackTools.h" diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt index e8ebeab2d428e34c342d900d7d6d4a1403ab92b8..424e9f893517f253e0cc1e5bdba1f11b6251c740 100644 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt +++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/CMakeLists.txt @@ -11,7 +11,7 @@ atlas_add_component( JetD3PDMaker src/*.cxx src/components/*.cxx INCLUDE_DIRS ${Boost_INCLUDE_DIRS} - LINK_LIBRARIES ${Boost_LIBRARIES} TrigCaloEvent CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel Navigation StoreGateLib Identifier EventKernel FourMomUtils GaudiKernel AnalysisTriggerEvent D3PDMakerInterfaces D3PDMakerUtils JetTagEvent JetTagInfo JetEvent Particle TileConditionsLib TileEvent TileIdentifier VxVertex ) + LINK_LIBRARIES ${Boost_LIBRARIES} TrigCaloEvent CaloEvent CaloGeoHelpers CaloIdentifier AthenaBaseComps AthenaKernel Navigation StoreGateLib Identifier EventKernel FourMomUtils GaudiKernel AnalysisTriggerEvent D3PDMakerInterfaces D3PDMakerUtils JetTagInfo JetEvent Particle TileConditionsLib TileEvent TileIdentifier VxVertex ) # Install files from the package: atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} ) diff --git a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/FlavorAssociationTool.cxx b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/FlavorAssociationTool.cxx index 89e6d01dec713fa61c08117e7a7d355e33a3bf7e..74d20978ec63e1d0ec2203cc1160bd4d3811e7d0 100644 --- a/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/FlavorAssociationTool.cxx +++ b/PhysicsAnalysis/D3PDMaker/JetD3PDMaker/src/FlavorAssociationTool.cxx @@ -14,7 +14,6 @@ #include "FlavorAssociationTool.h" #include "AthenaKernel/errorcheck.h" -#include "JetTagEvent/TrackAssociation.h" namespace D3PD { diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/CMakeLists.txt b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/CMakeLists.txt index 55533aa5fa795dc8187ebfe53e548fab0c350d7c..23f33809f9da74ea2b799d5616e3a46de62b9f78 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/CMakeLists.txt +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/CMakeLists.txt @@ -13,7 +13,7 @@ atlas_add_library( BTaggingLib src/BTagTrackAugmenterAlg.cxx PUBLIC_HEADERS BTagging LINK_LIBRARIES AsgTools AthContainers AthenaBaseComps CxxUtils FlavorTagDiscriminants GaudiKernel GeoPrimitives JetInterface JetRecLib MagFieldConditions ParticleJetToolsLib StoreGateLib TrkExInterfaces TrkVertexFitterInterfaces VxSecVertex VxVertex xAODBTagging xAODEventInfo xAODJet xAODMuon xAODTracking - PRIVATE_LINK_LIBRARIES InDetRecToolInterfaces JetTagEvent JetTagToolsLib Particle TrkLinks TrkSurfaces VxJetVertex xAODBase xAODCore ) + PRIVATE_LINK_LIBRARIES InDetRecToolInterfaces JetTagToolsLib Particle TrkLinks TrkSurfaces VxJetVertex xAODBase xAODCore ) atlas_add_component( BTagging src/components/*.cxx diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx index 97db5b993e23e7253d4a9dae1e991822fbca590d..51a1e3142c914f6c71bb6f6017b116b56c95b53c 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx @@ -15,8 +15,6 @@ #include "VxSecVertex/VxJetFitterVertexInfo.h" #include "Particle/TrackParticle.h" -#include "JetTagEvent/ISvxAssociation.h" -#include "JetTagEvent/TrackAssociation.h" #include "VxJetVertex/VxJetCandidate.h" #include "VxJetVertex/VxVertexOnJetAxis.h" diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx index e58450430ec4056046511b08fe3b844de1e4594c..ef869ebd451dda45899131c161170ceaecd82695 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx @@ -15,8 +15,6 @@ #include "VxSecVertex/VxJetFitterVertexInfo.h" #include "Particle/TrackParticle.h" -#include "JetTagEvent/ISvxAssociation.h" -#include "JetTagEvent/TrackAssociation.h" #include "VxJetVertex/VxJetCandidate.h" #include "VxJetVertex/VxVertexOnJetAxis.h" diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/CMakeLists.txt b/PhysicsAnalysis/JetTagging/JetTagEvent/CMakeLists.txt deleted file mode 100644 index 3184c157d107c92f5821d7edd41271981cb837a9..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration - -# Declare the package name: -atlas_subdir( JetTagEvent ) - -# Component(s) in the package: -atlas_add_library( JetTagEvent - src/*.cxx - PUBLIC_HEADERS JetTagEvent - LINK_LIBRARIES CaloGeoHelpers Navigation ParticleEvent JetEvent Particle - PRIVATE_LINK_LIBRARIES EventKernel NavFourMom VxSecVertex ) - -atlas_add_dictionary( JetTagEventDict - JetTagEvent/JetTagEventDict.h - JetTagEvent/selection.xml - LINK_LIBRARIES JetTagEvent ) diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ATLAS_CHECK_THREAD_SAFETY b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ATLAS_CHECK_THREAD_SAFETY deleted file mode 100644 index 1c12f498cea8f7f8b1a1a598bcf94aff72d55d5e..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ATLAS_CHECK_THREAD_SAFETY +++ /dev/null @@ -1 +0,0 @@ -PhysicsAnalysis/JetTagging/JetTagEvent diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ISvxAssociation.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ISvxAssociation.h deleted file mode 100644 index 5cc9ba3009da0566885619728a18bbd80ab705a2..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ISvxAssociation.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - ISvxConstituents.h - Description - ------------------- - begin : March, 2007 - authors : CSC b-tagging vertexing note group members - worked started by: Giacinto Piacquadio - email : giacinto.piacquadio@physik.uni-freiburg.de - - changes : new! - -***************************************************************************/ - -#ifndef ANALYSIS_ISVXASSOCIATION_H -#define ANALYSIS_ISVXASSOCIATION_H - -#include -#include - -#include "JetEvent/JetAssociationBase.h" - -namespace Trk { - class VxSecVertexInfo; -} - -namespace Analysis -{ - - - /** string to identify the constituent - */ - typedef std::string NameType; - - - - - class ISvxAssociation : public JetAssociationBase - { - - public: - ISvxAssociation() ; //!< constructor - ISvxAssociation(const NameType& name) ; //!< constructor - ISvxAssociation(const NameType& name,const ISvxAssociation & rhs); - ISvxAssociation(const ISvxAssociation & rhs); - ~ISvxAssociation() ; //!< destructor - - virtual ISvxAssociation* clone() const; - //!< a clone method for the proper workings of the copy constructor - - - ISvxAssociation& operator= (const ISvxAssociation &); - - /* retrieve method */ - const Trk::VxSecVertexInfo* vertexInfo() const; - - /* PAY ATTENTION! */ - /* Set function (OWNERSHIP of the object is taken by THIS class, so don't delete */ - /* the pointer you are providing afterwards) */ - void setVertexInfo(const Trk::VxSecVertexInfo*); - - /* dummy method for INavigable */ - virtual void fillToken( INavigationToken & /* thisToken */ ) const { - return; - } - - /* dummy method for INavigable */ - virtual void fillToken( INavigationToken & /* thisToken */, - const boost::any& /* weight */ ) const { - return; - } - - - private: - const Trk::VxSecVertexInfo* m_vertexInfo; - - } ; -} -#endif diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ISvxConstituent.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ISvxConstituent.h deleted file mode 100644 index 9702c95babf667970110592f5a8b55e1adf63f70..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ISvxConstituent.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - ISvxConstituents.h - Description - ------------------- - begin : March, 2007 - authors : CSC b-tagging vertexing note group members - worked started by: Giacinto Piacquadio - email : giacinto.piacquadio@physik.uni-freiburg.de - - changes : new! - -***************************************************************************/ - -#ifndef ANALYSIS_ISVXCONSTITUENT_H -#define ANALYSIS_ISVXCONSTITUENT_H - -#include -#include - -#include "ParticleEvent/IConstituent.h" - -namespace Trk { - class VxSecVertexInfo; -} - -namespace Analysis -{ - - - /** string to identify the constituent - */ - typedef std::string NameType; - - - - - class ISvxConstituent : public IConstituent - { - - public: - ISvxConstituent() ; //!< constructor - ISvxConstituent(NameType& name) ; //!< constructor - ISvxConstituent(NameType& name,const ISvxConstituent & rhs); - ISvxConstituent(const ISvxConstituent & rhs); - ~ISvxConstituent() ; //!< destructor - - virtual void setName(NameType& name); - //!< to set the name - - virtual NameType name() const; - //!< returns the infoType of the info objects. This has to be set by the tagger. - - virtual ISvxConstituent* clone() const; - //!< a clone method for the proper workings of the copy constructor - - - ISvxConstituent& operator= (const ISvxConstituent &); - - /* retrieve method */ - const Trk::VxSecVertexInfo* vertexInfo() const; - - /* PAY ATTENTION! */ - /* Set function (OWNERSHIP of the object is taken by THIS class, so don't delete */ - /* the pointer you are providing afterwards) */ - void setVertexInfo(const Trk::VxSecVertexInfo*); - - /* dummy method for INavigable */ - virtual void fillToken( INavigationToken & /* thisToken */ ) const { - return; - } - - /* dummy method for INavigable */ - virtual void fillToken( INavigationToken & /* thisToken */, - const boost::any& /* weight */ ) const { - return; - } - - - private: - std::string m_name; - const Trk::VxSecVertexInfo* m_vertexInfo; - - } ; -} -#endif diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetConstituent.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetConstituent.h deleted file mode 100755 index b155e9379cf02e65e39ffb6b6d209d419419b5d6..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetConstituent.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - JetConstituents.h - Description - ------------------- - begin : January, 2005 - authors : Kyle Cranmer, Andreas Wildauer - email : cranmer@cern.ch, andreas.wildauer@cern.ch - - changes : - -***************************************************************************/ - -#ifndef ANALYSIS_JETCONSTITUENT_H -#define ANALYSIS_JETCONSTITUENT_H - -#include -#include - -#include "Navigation/Navigable.h" -#include "JetEvent/JetCollection.h" -#include "ParticleEvent/IConstituent.h" -#include "CaloGeoHelpers/CaloSampling.h" - -namespace Analysis -{ - - - /** string to identify the constituent - */ - typedef std::string NameType; - - - /** Class JetConstituent: This is the implemntation of the - JetConstituent class for ParticleJet - - @author cranmer@cern.ch - */ - - class JetConstituent : public IConstituent, - public Navigable - { - - typedef Navigable::external_index_type index_type; - typedef Navigable::constituent_iter iter_type; - - - public: - JetConstituent() ; //!< constructor - JetConstituent(NameType& name) ; //!< constructor - ~JetConstituent() = default; - - virtual void setName(NameType& name); - //!< to set the name - - virtual NameType name() const; - //!< returns the infoType of the info objects. This has to be set by the tagger. - - virtual IConstituent* clone() const; - //!< a clone method for the proper workings of the copy constructor - - const Jet* jet() const; //!< get jet directly without token - - - double energyInSample(CaloSampling::CaloSample ) const; - - double energyInCryostat( ) const; - - - - // Set functions - void set_jet(const JetCollection* theContainer, - const Jet* the_jet, double weight=1); - - void set_jet(const JetCollection* theContainer, - index_type& theIndex, double weight=1); - - void set_constituent(const JetCollection* theContainer, - const Jet* the_jet, double weight=1) - {set_jet(theContainer, the_jet, weight);} - - void set_constituent(const JetCollection* theContainer, - index_type& theIndex, double weight=1) - {set_jet(theContainer, theIndex, weight);} - - double getJetWeight(const Jet* the_jet) const ; - - double getJetWeight(const JetCollection* theContainer, - index_type& theIndex) const; - - void set_energyInSample(CaloSampling::CaloSample , double); - - double wtCryo () const { return m_wtCryoLocal; } - - void set_wtCryo(double); - - private: - std::string m_name; - double m_wtCryoLocal; - std::vector m_energyInSample; - - - } ; - -} - - -#endif diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetTagEventDict.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetTagEventDict.h deleted file mode 100755 index f36137aa78bc0bacef7ffe4da2ceb93b7e21f705..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/JetTagEventDict.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef JETTAGEVENT_JETTAGEVENTDICT_H -#define JETTAGEVENT_JETTAGEVENTDICT_H - -#include "JetTagEvent/JetConstituent.h" -#include "JetTagEvent/TrackConstituents.h" -#include "JetTagEvent/TrackAssociation.h" -#include "JetTagEvent/ISvxConstituent.h" -#include "JetTagEvent/ISvxAssociation.h" - -// This needs to be here to work around a reflex dictionary generation problem. -// Otherwise, you'll get -// Warning in : no dictionary for class DataVector > is available -struct GCCXML_DUMMY_INSTANTIATION_JETTAGEVENT { - DataVector m_dummy1; - DataVector m_dummy2; -}; - - -#endif diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJet.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJet.h deleted file mode 100755 index a2a69a1e0891970af7d5eb3d30a7e6e425aeb0db..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJet.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - ParticleJet.h - Description - ------------------- - begin : 11-16-2005 - authors : Andreas Wildauer (CERN PH-ATC), Kyle Cranmer - email : andreas.wildauer@cern.ch, kyle.cranmer@cern.ch - changes : - - ***************************************************************************/ - -#ifndef JETTAGEVENT_PARTICLEJET_H -#define JETTAGEVENT_PARTICLEJET_H - -#error "ParticleJet has been retired. See: https://twiki.cern.ch/twiki/bin/view/Atlas/ParticleJetMerger" - -#endif // !JETTAGEVENT_PARTICLEJET_H diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJetContainer.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJetContainer.h deleted file mode 100755 index 8b9a634dda20c4de24d5a57c59b8d28a2838eef6..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJetContainer.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/******************************************************************** -NAME: ParticleJetContainer.h -AUTHORS: Andreas.Wildauer@cern.ch -PURPOSE: Container package for the new ParticleJet -********************************************************************/ -#ifndef JETTAGEVENT_NEWPARTICLEJETCONTAINER_H -#define JETTAGEVENT_NEWPARTICLEJETCONTAINER_H - -#error "ParticleJetContainer has been retired. See: https://twiki.cern.ch/twiki/bin/view/Atlas/ParticleJetMerger" - -#endif // !JETTAGEVENT_NEWPARTICLEJETCONTAINER_H diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJetParamDefs.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJetParamDefs.h deleted file mode 100755 index 158e63f44b4f53b982ad9b47ebcae7421d36e30d..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/ParticleJetParamDefs.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef JETTAGEVENT_PARTICLEJETPARAMDEFS_H -#define JETTAGEVENT_PARTICLEJETPARAMDEFS_H -/***************************************************************************** -Name : ParticleJetParamDefs.h -Package : offline/PhysicsAnalysis/JetTagging/JetTagEvent -Author : A. Wildauer -Created : March 2006 - -DESCRIPTION: - -This file defines enums for ParticleJet parameters - -*****************************************************************************/ - -namespace ParticleJetParams { - - // do not change the order of these enums. You can add one, but - // changing the order is bad. - enum Author {unknown=0, cone4=1, cone7=2, kt=3 }; -} - -#endif // JETTAGEVENT_PARTICLEJETPARAMDEFS_H diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackAssociation.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackAssociation.h deleted file mode 100755 index c6d8d151fe4d5689bb18311c15c66ff994ab8c43..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackAssociation.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - -#ifndef ANALYSIS_TRACKASSOCIATION_H -#define ANALYSIS_TRACKASSOCIATION_H - -#include -#include - -#include "JetEvent/JetAssociationBase.h" -#include "Navigation/Navigable.h" -#include "Particle/TrackParticleContainer.h" - -namespace Analysis -{ - class TrackAssociation : public JetAssociationBase, - public Navigable - { - typedef Navigable::external_index_type index_type; - typedef Navigable::constituent_iter iter_type; - // typedef object_iter iterator; - typedef std::string NameType; - - public: - TrackAssociation() ; //!< constructor - TrackAssociation(const NameType& name); //!< constructor - ~TrackAssociation() = default; - - typedef Navigable::object_iter iterator; - - /// get a vector of trackparticles. user must delete the vector, but not constituents - std::vector* tracks() const; - - JetAssociationBase* clone() const; - - unsigned int nTracks() const { return size() ; } - - double getTrackWeight(const Rec::TrackParticle* ) const; - - double getTrackWeight(const Rec::TrackParticleContainer*, const index_type& ) const; - - ////////////////////// - // Set Methods - ///////////////////// - - - /** set method for tracks. By default, navigable weight = 0 which - reflects that the tracks do not contribute to the kinematics. */ - void set_track(const Rec::TrackParticleContainer*, - const Rec::TrackParticle*, - double weight=0.); - - /** set method for tracks. By default, navigable weight = 0 which - reflects that the tracks do not contribute to the kinematics. */ - void set_track(const Rec::TrackParticleContainer*, - const index_type&, - double weight=0.); - - //compromise for above... use concrete container, but common name for templated methods - void set_association(const Rec::TrackParticleContainer*, - const Rec::TrackParticle*, - double weight=0.); - void set_association(const Rec::TrackParticleContainer*, - const index_type&, - double weight=0.); - - }; -} - -#endif diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackConstituents.h b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackConstituents.h deleted file mode 100755 index 29a443e059fa20ac8a7dc80efb6dcda9dd6b7ffe..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/TrackConstituents.h +++ /dev/null @@ -1,108 +0,0 @@ -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - TrackConstituent.h - Description - ------------------- - begin : January, 2005 - authors : Kyle Cranmer, Andreas Wildauer - email : cranmer@cern.ch, andreas.wildauer@cern.ch - - changes : - -***************************************************************************/ - -#ifndef ANALYSIS_TRACKCONSTITUENT_H -#define ANALYSIS_TRACKCONSTITUENT_H - -#include -#include - -#include "Navigation/Navigable.h" -#include "Particle/TrackParticleContainer.h" -#include "ParticleEvent/IConstituent.h" -//class INavigable4MomentumCollection; -//class INavigable4Momentum; - -namespace Analysis -{ - /** Class TrackConstituent: This is the implemntation of the - TrackConstituents class for ParticleJet - - @author cranmer@cern.ch - */ - - class TrackConstituents : public IConstituent, - public Navigable - { - typedef Navigable::external_index_type index_type; - typedef Navigable::constituent_iter iter_type; - // typedef object_iter iterator; - - public: - TrackConstituents() ; //!< constructor - TrackConstituents(NameType& name) ; //!< constructor - ~TrackConstituents() = default; - - typedef Navigable::object_iter iterator; - - - virtual NameType name() const; - //!< returns the infoType of the info objects. This has to be set by the tagger. - - virtual IConstituent* clone() const; - //!< a clone method for the proper workings of the copy constructor - - //iterator begin(); available via Navigable with (*iterator) giving TrackParticle* - //iterator end(); available via Navigable - - /// get a vector of trackparticles. user must delete the vector, but not constituents - std::vector* tracks() const; - - unsigned int nTracks() const { return size() ; } - - double getTrackWeight(const Rec::TrackParticle* ) const; - - double getTrackWeight(const Rec::TrackParticleContainer*, index_type& ) const; - - ////////////////////// - // Set Methods - ///////////////////// - - virtual void setName(NameType& name); - //!< to set the name - - /**set method for tracks. By default, navigable weight = 0 which - reflects that the tracks do not contribute to the kinematics.*/ - void set_track(const Rec::TrackParticleContainer*,const Rec::TrackParticle*, - double weight=0.); - /**set method for tracks. By default, navigable weight = 0 which - reflects that the tracks do not contribute to the kinematics.*/ - void set_track(const Rec::TrackParticleContainer*, index_type&, double weight=0.); - - // LACK OF KNOWLEDGE HACK HERE - // use also INavigable4MomentumCollection and INavigable4Momentum to add constituents - // would be nice to have a addConstituents method in the IConstituent interface (dont know if that is possible) - /**set method for tracks. By default, navigable weight = 0 which - reflects that the tracks do not contribute to the kinematics.*/ -// void set_track(const INavigable4MomentumCollection*,const INavigable4Momentum*, -// double weight=0.); - - //compromise for above... use concrete container, but common name for templated methods - void set_constituent(const Rec::TrackParticleContainer*,const Rec::TrackParticle*, - double weight=0.); - void set_constituent(const Rec::TrackParticleContainer*, index_type&, double weight=0.); - - - - private: - std::string m_name; - - } - ; - -} - - -#endif diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/selection.xml b/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/selection.xml deleted file mode 100755 index 952635b96bd8d9d263378f096d3dd14ae0780435..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/JetTagEvent/selection.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevelop.filelist b/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevelop.filelist deleted file mode 100755 index 240dbec96318b1b89662f96eeaf1b69e0b04402b..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevelop.filelist +++ /dev/null @@ -1 +0,0 @@ -# KDevelop Custom Project File List diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevses b/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevses deleted file mode 100755 index c3cc2cc6dfa89b69e59653ec87c54e27031c84d4..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/JetTagEvent.kdevses +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/packagedoc.h b/PhysicsAnalysis/JetTagging/JetTagEvent/doc/packagedoc.h deleted file mode 100644 index fb2b8cc955229f2106f47c75d6b6e8945e33e142..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/doc/packagedoc.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/** -@page JetTagEvent_page JetTagEvent - -@section JetTagEvent_introductionJetTagEvent Introduction -JetTagEvent contains classes to store tagging information. The classes are -used by the b-tagging packages BTagging. - -@section JetTagEvent_howitworksJetTagEvent How it works - -@section JetTagEvent_packagecontentJetTagEvent Package Contents -JetTagEvent contains the following files/classes: -- JetTag ... the basic b jet object. -- JetTagContainer ... and its container for storegate - - - -*/ diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/ISvxAssociation.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/ISvxAssociation.cxx deleted file mode 100644 index 01cc75c008ed9a770b3f9ca01317c2f2417d1c6c..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/ISvxAssociation.cxx +++ /dev/null @@ -1,86 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - ISvxConstituents.h - Description - ------------------- - begin : March, 2007 - authors : CSC b-tagging vertexing note group members - worked started by: Giacinto Piacquadio - email : giacinto.piacquadio@physik.uni-freiburg.de - - changes : new! - -***************************************************************************/ - -#include "JetTagEvent/ISvxAssociation.h" -#include "VxSecVertex/VxSecVertexInfo.h" - -namespace Analysis -{ - - - ISvxAssociation::ISvxAssociation(): - m_vertexInfo(0) {} - - ISvxAssociation::ISvxAssociation(const NameType& name): - m_vertexInfo(0) - { this->setName(name); } - - ISvxAssociation::~ISvxAssociation() - { - - //delete the vertexInfo (if there) - if (m_vertexInfo) { - delete m_vertexInfo; - m_vertexInfo=0; - } - } - - ISvxAssociation::ISvxAssociation(const ISvxAssociation & rhs): - INavigable(rhs), - JetAssociationBase(rhs), - m_vertexInfo(rhs.m_vertexInfo!=0 ? rhs.m_vertexInfo->clone() : 0) - { } - - ISvxAssociation::ISvxAssociation(const NameType& name,const ISvxAssociation & rhs): - JetAssociationBase(rhs), - m_vertexInfo(rhs.m_vertexInfo!=0 ? rhs.m_vertexInfo->clone() : 0) - { this->setName(name); } - - - ISvxAssociation* ISvxAssociation::clone() const - { return new ISvxAssociation( *this );} - - ISvxAssociation& ISvxAssociation::operator= (const ISvxAssociation & rhs) - { - if (this!=&rhs) { - this->setName(rhs.name()); - if (m_vertexInfo) { - delete m_vertexInfo; - m_vertexInfo=0; - } - if (rhs.m_vertexInfo) { - m_vertexInfo=rhs.m_vertexInfo->clone(); - } - } - return *this; - } - - const Trk::VxSecVertexInfo* ISvxAssociation::vertexInfo() const { - return m_vertexInfo; - } - - //PAY ATTENTION! - // Set function (OWNERSHIP of the object is taken by THIS class, so don't delete - // the pointer you are providing afterwards) - void ISvxAssociation::setVertexInfo(const Trk::VxSecVertexInfo* vertexInfo) { - if (m_vertexInfo) { - delete m_vertexInfo; - m_vertexInfo=0; - } - m_vertexInfo=vertexInfo; - } - -}//end namespace Analysis diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/ISvxConstituent.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/ISvxConstituent.cxx deleted file mode 100644 index d6b020552f7b92e70cb651457858039b0502d770..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/ISvxConstituent.cxx +++ /dev/null @@ -1,92 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - ISvxConstituents.h - Description - ------------------- - begin : March, 2007 - authors : CSC b-tagging vertexing note group members - worked started by: Giacinto Piacquadio - email : giacinto.piacquadio@physik.uni-freiburg.de - - changes : new! - -***************************************************************************/ - -#include "JetTagEvent/ISvxConstituent.h" -#include "VxSecVertex/VxSecVertexInfo.h" - -namespace Analysis -{ - - - ISvxConstituent::ISvxConstituent(): - m_vertexInfo(0) {} - - ISvxConstituent::ISvxConstituent(NameType& name): - m_name(name), - m_vertexInfo(0) - { } - - ISvxConstituent::~ISvxConstituent() - { - - //delete the vertexInfo (if there) - if (m_vertexInfo) { - delete m_vertexInfo; - m_vertexInfo=0; - } - } - - ISvxConstituent::ISvxConstituent(const ISvxConstituent & rhs): - INavigable(rhs), - IConstituent(rhs), - m_vertexInfo(rhs.m_vertexInfo!=0 ? rhs.m_vertexInfo->clone() : 0) - { } - - ISvxConstituent::ISvxConstituent(NameType& name,const ISvxConstituent & rhs): - IConstituent(rhs), - m_name(name), - m_vertexInfo(rhs.m_vertexInfo!=0 ? rhs.m_vertexInfo->clone() : 0) - { } - - - void ISvxConstituent::setName(NameType& name) {m_name = name;} - - NameType ISvxConstituent::name() const { return m_name;} - - ISvxConstituent* ISvxConstituent::clone() const - { return new ISvxConstituent( *this );} - - ISvxConstituent& ISvxConstituent::operator= (const ISvxConstituent & rhs) - { - if (this!=&rhs) { - m_name=rhs.m_name; - if (m_vertexInfo) { - delete m_vertexInfo; - m_vertexInfo=0; - } - if (rhs.m_vertexInfo) { - m_vertexInfo=rhs.m_vertexInfo->clone(); - } - } - return *this; - } - - const Trk::VxSecVertexInfo* ISvxConstituent::vertexInfo() const { - return m_vertexInfo; - } - - //PAY ATTENTION! - // Set function (OWNERSHIP of the object is taken by THIS class, so don't delete - // the pointer you are providing afterwards) - void ISvxConstituent::setVertexInfo(const Trk::VxSecVertexInfo* vertexInfo) { - if (m_vertexInfo) { - delete m_vertexInfo; - m_vertexInfo=0; - } - m_vertexInfo=vertexInfo; - } - -}//end namespace Analysis diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/JetConstituent.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/JetConstituent.cxx deleted file mode 100755 index 983a5d93b45f568e4d7c1748430b29d33d03455f..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/JetConstituent.cxx +++ /dev/null @@ -1,144 +0,0 @@ -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - JetConstituents.h - Description - ------------------- - begin : January, 2005 - authors : Kyle Cranmer, Andreas Wildauer - email : cranmer@cern.ch, andreas.wildauer@cern.ch - - changes : - -***************************************************************************/ - -#include "JetTagEvent/JetConstituent.h" - -namespace Analysis -{ - - - JetConstituent::JetConstituent(): - m_wtCryoLocal ( 0 ), - m_energyInSample ( CaloSampling::Unknown ) - { } - - JetConstituent::JetConstituent(NameType& name): - m_wtCryoLocal ( 0 ), - m_energyInSample ( CaloSampling::Unknown )//reserve space in vector - { m_name = name; } - - - void JetConstituent::setName(NameType& name) {m_name = name;} - - NameType JetConstituent::name() const { return m_name;} - - IConstituent* JetConstituent::clone() const - { return new JetConstituent( *this );} - - const Jet* JetConstituent::jet() const - { - //get jet from Navigable - if (this->size() ==0) - return 0; - else if (this->size() > 1) - return 0; - // this shouldn't happen - else - return getConstituentPtr((this->getConstituents()).begin()); - } - - void JetConstituent::set_jet(const JetCollection* theContainer, - const Jet* the_jet, - double weight) - { - double newWeight = weight; - // jet already in collection - if ( this->contains(the_jet) ) - { - // update weight - newWeight *= this->getJetWeight(the_jet); - // remove the previous jet - this->remove(the_jet); - } - - // from Navigable base - this->putElement(theContainer,the_jet,newWeight); - - } - - void JetConstituent::set_jet(const JetCollection* theContainer, - index_type& theIndex, - double weight) - { - double newWeight = weight; - // jet already in collection - if ( this->contains(theContainer,theIndex) ) - { - // update weight - newWeight *= this->getJetWeight(theContainer,theIndex); - // remove the previous jet - this->remove(theContainer,theIndex); - } - - // from Navigable base - this->putElement(theContainer,theIndex,newWeight); - - } - - double JetConstituent::getJetWeight(const Jet* the_jet) const - { - // from Navigable - return (this->contains(the_jet) ) - ? this->getParameter(the_jet) - : 0.; - } - - double JetConstituent::getJetWeight(const JetCollection* theContainer, - index_type& theIndex) const - { - // from Navigable - return (this->contains(theContainer,theIndex)) - ? this->getParameter(theContainer,theIndex) - : 0.; - } - - - ///This is the energy in a sample with the navigation weight and hadronic calibration. - double JetConstituent::energyInSample( CaloSampling::CaloSample s ) const - { - return m_energyInSample[s]; - } - - /**The estimate of the energy cryostat. - Normally this is wtCryo*sqrt(EMB3*tileBar0) where EMB3&tilebar0 do - NOT have any hadronic calibration applied. - In order to avoid holding a lot more information in the ParticleJet we return - wtCryoLocal * sqrt(EMB3_calib * tileBar0_calib) - where - EMB3_calib = average_EMB3_weight * EMB3 - tileBar0_calib = average_TileBar0_weight * tileBar0 - and thus - wtCryoLocal = wtCryo / sqrt( average_TileBar0_weight * average_EMB3_weight). - */ - double JetConstituent::energyInCryostat() const - { - return m_wtCryoLocal*sqrt( fabs(m_energyInSample[CaloSampling::EMB3]) - *fabs(m_energyInSample[CaloSampling::TileBar0]) ); - } - - /// set energy in sample WITH hadronic weights - void JetConstituent::set_energyInSample(CaloSampling::CaloSample s, double e) - { - m_energyInSample[s] = e; - } - - /** Set wtCryoLocal defined as wtCryoLocal = wtCryo / sqrt( - average_TileBar0_weight * average_EMB3_weight) */ - void JetConstituent::set_wtCryo(double wtCryoLocal) - { - m_wtCryoLocal = wtCryoLocal; - } - -} diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackAssociation.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackAssociation.cxx deleted file mode 100755 index a2f2541f1e71745fe5e74140075c5986b1442599..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackAssociation.cxx +++ /dev/null @@ -1,96 +0,0 @@ -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - - -#include "JetTagEvent/TrackAssociation.h" -#include "EventKernel/INavigable4Momentum.h" -#include "NavFourMom/INavigable4MomentumCollection.h" -namespace Analysis -{ - - TrackAssociation::TrackAssociation() - { } - - TrackAssociation::TrackAssociation(const NameType& name) - { this->setName(name); } - - JetAssociationBase* TrackAssociation::clone() const - { - return new TrackAssociation( *this ); - } - - void TrackAssociation::set_track(const Rec::TrackParticleContainer* theContainer, - const Rec::TrackParticle* theTrack, double weight) - { - double newWeight = weight; - // track already in collection - if ( this->contains(theTrack) ) - { - // update weight - newWeight *= this->getTrackWeight(theTrack); - // remove the previous track - this->remove(theTrack); - } - - // from Navigable base - this->putElement(theContainer,theTrack,newWeight); - } - - void TrackAssociation::set_track(const Rec::TrackParticleContainer* theContainer, - const index_type& theIndex, double weight) - { - double newWeight = weight; - // track already in collection - if ( this->contains(theContainer,theIndex) ) - { - // update weight - newWeight *= this->getTrackWeight(theContainer,theIndex); - // remove the previous track - this->remove(theContainer,theIndex); - } - - // from Navigable base - this->putElement(theContainer,theIndex,newWeight); - } - - void TrackAssociation::set_association(const Rec::TrackParticleContainer* theContainer, - const Rec::TrackParticle* theTrack, double weight) - { - this->set_track(theContainer, theTrack, weight); - } - - void TrackAssociation::set_association(const Rec::TrackParticleContainer* theContainer, - const index_type& theIndex, double weight) - { - this->set_track(theContainer, theIndex, weight); - } - - double TrackAssociation::getTrackWeight(const Rec::TrackParticle* theTrack) const - { - // from Navigable - return (this->contains(theTrack) ) - ? this->getParameter(theTrack) - : 0.; - } - - double TrackAssociation::getTrackWeight(const Rec::TrackParticleContainer* theContainer, - const index_type& theIndex) const - { - // from Navigable - return (this->contains(theContainer,theIndex)) - ? this->getParameter(theContainer,theIndex) - : 0.; - } - - std::vector* TrackAssociation::tracks() const - { - std::vector* tracks = - new std::vector(); - - for(iterator it = begin(); it!= end(); ++it) - tracks->push_back(*it); - - return tracks; - } -} diff --git a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackConstituents.cxx b/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackConstituents.cxx deleted file mode 100755 index c7303594897113b12c479dc7cef5634da938b776..0000000000000000000000000000000000000000 --- a/PhysicsAnalysis/JetTagging/JetTagEvent/src/TrackConstituents.cxx +++ /dev/null @@ -1,129 +0,0 @@ -/* - Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration -*/ - -/*************************************************************************** - TrackConstituent.h - Description - ------------------- - begin : January, 2005 - authors : Kyle Cranmer, Andreas Wildauer - email : cranmer@cern.ch, andreas.wildauer@cern.ch - - changes : - -***************************************************************************/ - -#include "JetTagEvent/TrackConstituents.h" -#include "EventKernel/INavigable4Momentum.h" -#include "NavFourMom/INavigable4MomentumCollection.h" -namespace Analysis -{ - - - TrackConstituents::TrackConstituents() - { } - - TrackConstituents::TrackConstituents(NameType& name) - { m_name = name; } - - void TrackConstituents::setName(NameType& name) {m_name = name;} - - NameType TrackConstituents::name() const { return m_name;} - - IConstituent* TrackConstituents::clone() const - { return new TrackConstituents( *this );} - - - void TrackConstituents::set_track(const Rec::TrackParticleContainer* theContainer, - const Rec::TrackParticle* theTrack, double weight) - { - double newWeight = weight; - // track already in collection - if ( this->contains(theTrack) ) - { - // update weight - newWeight *= this->getTrackWeight(theTrack); - // remove the previous track - this->remove(theTrack); - } - - // from Navigable base - this->putElement(theContainer,theTrack,newWeight); - - - } - - void TrackConstituents::set_track(const Rec::TrackParticleContainer* theContainer, - index_type& theIndex, double weight) - { - double newWeight = weight; - // track already in collection - if ( this->contains(theContainer,theIndex) ) - { - // update weight - newWeight *= this->getTrackWeight(theContainer,theIndex); - // remove the previous track - this->remove(theContainer,theIndex); - } - - // from Navigable base - this->putElement(theContainer,theIndex,newWeight); - - } - - void TrackConstituents::set_constituent(const Rec::TrackParticleContainer* theContainer, - const Rec::TrackParticle* theTrack, double weight) - { this->set_track(theContainer, theTrack, weight); } - - void TrackConstituents::set_constituent(const Rec::TrackParticleContainer* theContainer, - index_type& theIndex, double weight) - { this->set_track(theContainer, theIndex, weight); } - -/* void TrackConstituents::set_track(const INavigable4MomentumCollection* theContainer, - const INavigable4Momentum* theTrack, double weight) - { - double newWeight = weight; - // track already in collection - if ( this->contains(theTrack) ) - { - // update weight - newWeight *= this->getTrackWeight(theTrack); - // remove the previous track - this->remove(theTrack); - } - - // from Navigable base - this->putElement(theContainer,theTrack,newWeight); - - - }*/ - - double TrackConstituents::getTrackWeight(const Rec::TrackParticle* theTrack) const - { - // from Navigable - return (this->contains(theTrack) ) - ? this->getParameter(theTrack) - : 0.; - } - - double TrackConstituents::getTrackWeight(const Rec::TrackParticleContainer* theContainer, - index_type& theIndex) const - { - // from Navigable - return (this->contains(theContainer,theIndex)) - ? this->getParameter(theContainer,theIndex) - : 0.; - } - - std::vector* TrackConstituents::tracks() const - { - std::vector* tracks = - new std::vector(); - - for(iterator it = begin(); it!= end(); ++it) - tracks->push_back(*it); - - return tracks; - } - -} diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/CMakeLists.txt b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/CMakeLists.txt index a994a5edb5b1152d48ffcfa68da855c17453bdd8..c8ab996061efc96f024224c2f50f80f3ce0064f9 100644 --- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/CMakeLists.txt +++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/CMakeLists.txt @@ -7,7 +7,7 @@ atlas_subdir( JetTagInfoTPCnv ) atlas_add_library( JetTagInfoTPCnv src/*.cxx PUBLIC_HEADERS JetTagInfoTPCnv - LINK_LIBRARIES AthenaPoolUtilities CxxUtils EventPrimitives JetTagEvent JetTagInfo MuonIDEvent JetEvent JetEventTPCnv Particle egammaEvent VxVertex TrkEventTPCnv DataModelAthenaPoolLib AthenaPoolCnvSvcLib + LINK_LIBRARIES AthenaPoolUtilities CxxUtils EventPrimitives JetTagInfo MuonIDEvent JetEvent JetEventTPCnv Particle egammaEvent VxVertex TrkEventTPCnv DataModelAthenaPoolLib AthenaPoolCnvSvcLib PRIVATE_LINK_LIBRARIES GaudiKernel ) atlas_add_dictionary( JetTagInfoTPCnvDict diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/ISvxAssociationCnv_p1.h b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/ISvxAssociationCnv_p1.h index fc3c9e4384595ca47a2cf24f559fe08fb49b9d0b..dd427ee611e411745dd3d57f6691d8d850441f42 100644 --- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/ISvxAssociationCnv_p1.h +++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/ISvxAssociationCnv_p1.h @@ -8,7 +8,6 @@ #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" #include "JetTagInfoTPCnv/ISvxAssociation_p1.h" -#include "JetTagEvent/ISvxAssociation.h" class MsgStream; diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/TrackAssociationCnv_p1.h b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/TrackAssociationCnv_p1.h index 35e14cba05c169e8eddfa0e313e73b1bbbd64d43..e2b358e65c56b71c4c574889ff170c82f18eed5d 100644 --- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/TrackAssociationCnv_p1.h +++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/JetTagInfoTPCnv/TrackAssociationCnv_p1.h @@ -7,7 +7,6 @@ #include "AthenaPoolCnvSvc/T_AthenaPoolTPConverter.h" -#include "JetTagEvent/TrackAssociation.h" #include "JetTagInfoTPCnv/NavAssociationCommon_p1.h" #include "DataModelAthenaPool/NavigableCnv_p1.h" diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/ISvxAssocationCnv_p1.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/ISvxAssocationCnv_p1.cxx index 034f9e0bb6ea851b76e236dfd6e75f02a4f3c049..ebdfe841a27822ed00187aa492a5412e81d27af8 100644 --- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/ISvxAssocationCnv_p1.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/ISvxAssocationCnv_p1.cxx @@ -6,7 +6,6 @@ /// Write out a ISvxAssociation /// -#include "JetTagEvent/ISvxAssociation.h" #include "JetTagInfoTPCnv/ISvxAssociationCnv_p1.h" namespace Analysis { diff --git a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/TrackAssociationCnv_p1.cxx b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/TrackAssociationCnv_p1.cxx index e029ef51b8fb62e5aabd8ab1d58ed6f26b10ed23..9d84597d8c1fdbdd33ef78ea3b86c880c02b3437 100644 --- a/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/TrackAssociationCnv_p1.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagInfoTPCnv/src/TrackAssociationCnv_p1.cxx @@ -6,7 +6,6 @@ /// Write out a TrackAssociation /// -#include "JetTagEvent/TrackAssociation.h" #include "JetTagInfoTPCnv/TrackAssociationCnv_p1.h" namespace Analysis { diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackCounting.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackCounting.cxx index 544639c272992cb330e2e01702c8e6d63c671c6e..372d3d4cfc6bf48d6be93babdc135057b9301286 100644 --- a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackCounting.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackCounting.cxx @@ -7,7 +7,6 @@ #include "GaudiKernel/IToolSvc.h" //#include "JetEvent/Jet.h" -#include "JetTagEvent/TrackAssociation.h" #include "JetTagInfo/TrackCountingInfo.h" #include "JetTagInfo/TruthInfo.h" #include "JetTagInfo/TrackGrade.h" diff --git a/Reconstruction/RecJiveXML/CMakeLists.txt b/Reconstruction/RecJiveXML/CMakeLists.txt index 867af5e2690a0370cda248bb097b2d04ca825fd2..4bb9518356a92719d3c40b0dab47df2724221a47 100644 --- a/Reconstruction/RecJiveXML/CMakeLists.txt +++ b/Reconstruction/RecJiveXML/CMakeLists.txt @@ -11,7 +11,7 @@ atlas_add_component( RecJiveXML src/*.cxx src/components/*.cxx INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} - LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkParameters JiveXMLLib CaloEvent Navigation JetTagEvent JetEvent MissingETEvent TrkTrack ) + LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps TrkParameters JiveXMLLib CaloEvent Navigation JetEvent MissingETEvent TrkTrack ) # Install files from the package: atlas_install_joboptions( share/*.py ) diff --git a/Reconstruction/RecJiveXML/src/JetRecJetRetriever.cxx b/Reconstruction/RecJiveXML/src/JetRecJetRetriever.cxx index 4b47a36c34e0271ca7647248ba047c227d86b7ea..c7414cd240407fd112cb1d92f48d673626d7c6d2 100755 --- a/Reconstruction/RecJiveXML/src/JetRecJetRetriever.cxx +++ b/Reconstruction/RecJiveXML/src/JetRecJetRetriever.cxx @@ -12,7 +12,6 @@ #include "JiveXML/DataType.h" -#include "JetTagEvent/TrackAssociation.h" #include "TrkTrack/TrackCollection.h"