From 34cacd44e096cccebbfd866a2eb11c834b398c38 Mon Sep 17 00:00:00 2001 From: Emmanuel Le Guirriec <emmanuel.le.guirriec@cern.ch> Date: Thu, 21 Dec 2017 09:24:24 +0100 Subject: [PATCH] Clean TrackSelector, update WorkDir/CMakeList Former-commit-id: 49f985365a5be52144eddc9478bd02c7a7384d21 --- .../JetTagTools/JetTagTools/TrackSelector.h | 3 -- .../JetTagTools/src/TrackSelector.cxx | 39 ------------------- Projects/WorkDir/CMakeLists.txt | 2 +- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/JetTagTools/TrackSelector.h b/PhysicsAnalysis/JetTagging/JetTagTools/JetTagTools/TrackSelector.h index 2c69b7471fa..e1df53c3b8b 100644 --- a/PhysicsAnalysis/JetTagging/JetTagTools/JetTagTools/TrackSelector.h +++ b/PhysicsAnalysis/JetTagging/JetTagTools/JetTagTools/TrackSelector.h @@ -46,9 +46,6 @@ public: /** Returns true if the argument track fulfills the selection */ bool selectTrack(const xAOD::TrackParticle* track, double refPt = 0); - /** Processes all the tracks in input and outputs the tracks - passing the selection */ - //StatusCode selectAllTracks(); inline const std::bitset<17> currentTrackpassedCuts() const { return m_passedCuts; } diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx index 5485bd95d35..41fba81e1c7 100644 --- a/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/TrackSelector.cxx @@ -12,7 +12,6 @@ #include "CLHEP/GenericFunctions/CumulativeChiSquare.hh" #include "GeoPrimitives/GeoPrimitives.h" #include "GaudiKernel/IToolSvc.h" -//#include "StoreGate/ReadHandle.h" #include "ITrackToVertex/ITrackToVertex.h" #include <TMath.h> #include <string> @@ -364,42 +363,4 @@ namespace Analysis { return pass; } - -// StatusCode TrackSelector::selectAllTracks() { - - /** retrieve input tracks: */ - //const xAOD::TrackParticleContainer* inputTracks(0); - //SG::ReadHandle<xAOD::TrackParticleContainer> inputTracks(m_inputTrackCollection); -/* StatusCode sc = evtStore()->retrieve(inputTracks, m_inputTrackCollection); - if (sc.isFailure()) { - ATH_MSG_ERROR("#BTAG# TrackParticleContainer " << m_inputTrackCollection << " not found."); - return sc; - } - ATH_MSG_VERBOSE("#BTAG# TrackParticleContainer " << m_inputTrackCollection << " found."); -*/ - /** create output container: */ -// xAOD::TrackParticleContainer* outputTracks = new xAOD::TrackParticleContainer(); - - /** loop on tracks, select and fill output container: */ -/* xAOD::TrackParticleContainer::const_iterator nextTrk(inputTracks->begin()); - xAOD::TrackParticleContainer::const_iterator lastTrk(inputTracks->end()); - for (; nextTrk!=lastTrk; nextTrk++) { - if( this->selectTrack( (*nextTrk) ) ) { - ATH_MSG_VERBOSE("#BTAG# track selected"); - outputTracks->push_back( new xAOD::TrackParticle(**nextTrk) ); - } - } -*/ - /** storing output collection in StoreGate: */ -/* ATH_MSG_VERBOSE("#BTAG# recording to StoreGate: " << m_outputTrackCollection); - StatusCode sc = evtStore()->record(outputTracks, m_outputTrackCollection, false); - if (sc.isFailure()) { - ATH_MSG_ERROR("#BTAG# unable to store TrackParticleContainer " << m_outputTrackCollection); - return sc; - } - ATH_MSG_VERBOSE("#BTAG# TrackParticleContainer " << m_outputTrackCollection << " stored."); - - return StatusCode::SUCCESS; - } -*/ } diff --git a/Projects/WorkDir/CMakeLists.txt b/Projects/WorkDir/CMakeLists.txt index d6872700008..68f93412102 100644 --- a/Projects/WorkDir/CMakeLists.txt +++ b/Projects/WorkDir/CMakeLists.txt @@ -15,7 +15,7 @@ find_package( AtlasCMake QUIET ) # of possible project names. Basically the names of all the other # sub-directories inside the Projects/ directory in the repository. set( _parentProjectNames Athena AthenaP1 AnalysisBase AthAnalysisBase - AthSimulation ) + AthSimulation AthDerivation) set( _defaultParentProject Athena ) set( _defaultUseFortran TRUE ) foreach( _pp ${_parentProjectNames} ) -- GitLab