diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt
index 9784c88529288d930b788cea79cb150312c59f05..9fd5e63a89fec886480ffdcc13485d048d8ea5b9 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUser/CMakeLists.txt
@@ -1,127 +1,116 @@
-################################################################################
-# Package: TrigInDetAnalysisUser
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigInDetAnalysisUser )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
- Trigger/TrigAnalysis/TrigInDetAnalysis
- Trigger/TrigAnalysis/TrigInDetAnalysisExample
- Trigger/TrigAnalysis/TrigInDetAnalysisUtils )
-
# External dependencies:
-find_package( ROOT COMPONENTS Graf Gpad Cint Core Tree MathCore Hist RIO pthread )
-
-include_directories(Resplot/src Readcards/src)
+find_package( ROOT COMPONENTS Core Hist MathCore Graf Gpad RIO Tree )
-# Component(s) in the package:
+# Libraries in the package:
atlas_add_root_dictionary( Resplot
- ResplotDictSource
- ROOT_HEADERS Resplot/src/Resplot.h
- EXTERNAL_PACKAGES ROOT )
+ ResplotDictSource
+ ROOT_HEADERS Resplot/src/Resplot.h
+ EXTERNAL_PACKAGES ROOT )
atlas_add_library( Resplot
- Resplot/src/Resplot.cxx
- Resplot/src/generate.cxx
- Resplot/src/rmsFrac.cxx
- ${ResplotDictSource}
- NO_PUBLIC_HEADERS
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES TrigInDetAnalysisExampleLib
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisUtils )
+ Resplot/src/*.h Resplot/src/Resplot.cxx Resplot/src/generate.cxx
+ Resplot/src/rmsFrac.cxx ${ResplotDictSource}
+ NO_PUBLIC_HEADERS
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} )
+target_include_directories( Resplot PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Resplot/src> )
atlas_add_library( Readcards
- Readcards/src/IReadCards.cxx
- Readcards/src/ReadCards.cxx
- Readcards/src/Value.cxx
- Readcards/src/utils.cxx
- NO_PUBLIC_HEADERS
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES TrigInDetAnalysisExampleLib Resplot
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisUtils )
+ Readcards/src/*.h Readcards/src/IReadCards.cxx Readcards/src/ReadCards.cxx
+ Readcards/src/Value.cxx Readcards/src/utils.cxx
+ NO_PUBLIC_HEADERS )
+target_include_directories( Readcards PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Readcards/src> )
atlas_add_library( TIDA
- Analysis/src/ConfAnalysis.cxx
- Analysis/src/ConfVtxAnalysis.cxx
- Analysis/src/PurityAnalysis.cxx
- Analysis/src/globals.cxx
- NO_PUBLIC_HEADERS
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES TrigInDetAnalysisExampleLib Resplot Readcards
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisUtils )
+ Analysis/src/ConfAnalysis.h Analysis/src/ConfAnalysis.cxx
+ Analysis/src/ConfVtxAnalysis.h Analysis/src/ConfVtxAnalysis.cxx
+ Analysis/src/PurityAnalysis.h Analysis/src/PurityAnalysis.cxx
+ Analysis/src/globals.h Analysis/src/globals.cxx
+ NO_PUBLIC_HEADERS
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis
+ TrigInDetAnalysisExampleLib Resplot Readcards )
+target_include_directories( TIDA PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Analysis/src> )
atlas_add_library( TIDAcomputils
- Analysis/src/computils.cxx
- NO_PUBLIC_HEADERS
- PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES TrigInDetAnalysisExampleLib Resplot Readcards TIDA
- PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisUtils )
-
+ Analysis/src/computils.h Analysis/src/computils.cxx
+ NO_PUBLIC_HEADERS
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis Readcards )
+target_include_directories( TIDAcomputils PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Analysis/src> )
+
+# Executables in the package:
atlas_add_executable( TIDAreader
- Analysis/src/reader.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/reader.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis Readcards )
atlas_add_executable( TIDArdict
- Analysis/src/rmain.cxx
- Analysis/src/TagNProbe.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/rmain.cxx Analysis/src/TagNProbe.h Analysis/src/TagNProbe.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisUtils
+ TrigInDetAnalysisExampleLib Resplot Readcards TIDA TIDAcomputils )
atlas_add_executable( TIDAcomparitor
- Analysis/src/comparitor.cxx
- Analysis/src/AtlasStyle.cxx
- Analysis/src/AtlasLabels.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/comparitor.cxx
+ Analysis/src/AtlasStyle.h Analysis/src/AtlasStyle.cxx
+ Analysis/src/AtlasLabels.h Analysis/src/AtlasLabels.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis Resplot Readcards
+ TIDAcomputils )
atlas_add_executable( TIDAcpucost
- Analysis/src/cpucost.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/cpucost.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} Readcards TIDAcomputils )
atlas_add_executable( TIDAchains
- Analysis/src/chains.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/chains.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_executable( TIDAskim
- Analysis/src/skim.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/skim.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis Readcards )
atlas_add_executable( TIDAfastadd
- Analysis/src/fastadd.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/fastadd.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_executable( TIDArefit
- Analysis/src/refit.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/refit.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis Resplot )
atlas_add_executable( TIDAlistroot
- Analysis/src/listroot.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/listroot.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis Readcards )
atlas_add_executable( TIDAmakeSmallRefFile
- Analysis/src/makeSmallRefFile.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} TrigInDetAnalysis TrigInDetAnalysisExampleLib TrigInDetAnalysisUtils Resplot Readcards TIDA TIDAcomputils )
+ Analysis/src/makeSmallRefFile.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_executable( TIDAruntool
- Analysis/src/runtool.cxx
- Analysis/src/computils.cxx
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} )
+ Analysis/src/runtool.cxx
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} TIDAcomputils )
atlas_add_executable( TIDAsb
- Analysis/src/chainparser.cxx
- INCLUDE_DIRS
- LINK_LIBRARIES Readcards )
+ Analysis/src/chainparser.cxx
+ LINK_LIBRARIES Readcards )
# Disable naming convention checker.
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/CMakeLists.txt b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/CMakeLists.txt
index 8137f81113fc726eb3151ca01ef5c56a63f55980..e5e58b3127f2373865d1c1e80896b6338dbf4580 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/CMakeLists.txt
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/CMakeLists.txt
@@ -1,43 +1,18 @@
-################################################################################
-# Package: TrigInDetAnalysisUtils
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigInDetAnalysisUtils )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- Control/StoreGate
- GaudiKernel
- PhysicsAnalysis/TruthParticleID/McParticleEvent
- Reconstruction/Particle
- Reconstruction/MuonIdentification/muonEvent
- Reconstruction/egamma/egammaEvent
- Reconstruction/tauEvent
- Event/xAOD/xAODMuon
- Event/xAOD/xAODEgamma
- Event/xAOD/xAODTau
- Event/xAOD/xAODTruth
- Tracking/TrkEvent/TrkParameters
- Tracking/TrkEvent/TrkTrack
- Tracking/TrkEvent/TrkTrackSummary
- Tracking/TrkExtrapolation/TrkExUtils
- Tracking/TrkTools/TrkParticleCreator
- Tracking/TrkTools/TrkToolInterfaces
- Trigger/TrigAnalysis/TrigDecisionTool
- Trigger/TrigAnalysis/TrigInDetAnalysis
- Trigger/TrigEvent/TrigInDetEvent
- Trigger/TrigEvent/TrigSteeringEvent
- Trigger/TrigTruthEvent/TrigInDetTruthEvent
- Generators/AtlasHepMC )
-
# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
+find_package( ROOT COMPONENTS Core MathCore )
# Component(s) in the package:
atlas_add_library( TrigInDetAnalysisUtils
- src/*.cxx
- PUBLIC_HEADERS TrigInDetAnalysisUtils
- INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${ROOT_LIBRARIES} AtlasHepMCLib GaudiKernel McParticleEvent muonEvent Particle egammaEvent tauEvent TrkParameters TrkTrack TrkTrackSummary TrkExUtils TrkToolInterfaces TrigInDetAnalysis TrigInDetEvent TrigSteeringEvent TrigInDetTruthEvent StoreGateLib SGtests TrigDecisionToolLib )
-
+ TrigInDetAnalysisUtils/*.h src/*.cxx
+ PUBLIC_HEADERS TrigInDetAnalysisUtils
+ INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+ LINK_LIBRARIES ${ROOT_LIBRARIES} GaudiKernel McParticleEvent Particle
+ muonEvent egammaEvent tauEvent xAODMuon xAODEgamma xAODTau xAODTruth
+ TrkParameters TrkTrack TrkToolInterfaces TrigDecisionToolLib
+ TrigInDetAnalysis TrigInDetEvent TrigSteeringEvent TrigInDetTruthEvent
+ AtlasHepMCLib )
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
index 6b20b7cd5da9f79846c6e5c485247d5b6024000b..69ec81e65114b3626acbd8e130f5e4ab9d6364b5 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisUtils/TrigInDetAnalysisUtils/T_AnalysisConfig.h
@@ -3,9 +3,9 @@
** @file T_AnalysisConfig.h
**
** @author mark sutton
- ** @date Fri 11 Jan 2019 07:06:39 CET
+ ** @date Fri 11 Jan 2019 07:06:39 CET
**
- ** Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ ** Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
**/
@@ -18,10 +18,8 @@
#include <map>
#include "GaudiKernel/IToolSvc.h"
-#include "GaudiKernel/MsgStream.h"
#include "GaudiKernel/ITHistSvc.h"
// #include "GaudiKernel/AlgFactory.h"
-#include "StoreGate/StoreGateSvc.h"
#include "TrigDecisionTool/TrigDecisionTool.h"
@@ -50,7 +48,6 @@
#endif
class MsgSvc;
-class StoreGateSvc;
// class TrackAssociator;
// class Converter;
@@ -220,7 +217,7 @@ public:
void addSelectionFilter(TrackFilter* filter) { m_filters[2].push_back(filter); }
// Initialize, execute and finalize generic methods
- virtual void initialize(Provider* p, ToolHandle<Trig::TrigDecisionTool>* tdt ) {
+ virtual void initialize(Provider* p, ToolHandle<Trig::TrigDecisionTool>* tdt ) {
m_provider = p;
m_tdt = tdt;
if ( m_tdt==0 ) m_analysis->initialise();
@@ -282,18 +279,18 @@ public:
void keepAllEvents( bool b ) { m_keepAllEvents = b; }
- void setUseHighestPT( bool b ) { m_useHighestPT=b; }
- bool getUseHighestPT() const { return m_useHighestPT; }
+ void setUseHighestPT( bool b ) { m_useHighestPT=b; }
+ bool getUseHighestPT() const { return m_useHighestPT; }
- void setVtxIndex( int i ) { m_vtxIndex=i; }
- int getVtxIndex() const { return m_vtxIndex; }
+ void setVtxIndex( int i ) { m_vtxIndex=i; }
+ int getVtxIndex() const { return m_vtxIndex; }
bool filterOnRoi() const { return m_filterOnRoi; }
bool setFilterOnRoi(bool b) { return m_filterOnRoi=b; }
- void setRequireDecision(bool b) { m_requireDecision=b; }
- bool requireDecision() const { return m_requireDecision; }
-
+ void setRequireDecision(bool b) { m_requireDecision=b; }
+ bool requireDecision() const { return m_requireDecision; }
+
protected:
virtual void loop() = 0;
@@ -310,8 +307,8 @@ protected:
/// until it has been properly debugged, then it can be removed
// std::cout << "try " << key << "\t" << m_provider->evtStore()->template transientContains<Collection>(key) << std::endl;
- /// will not use the te name here, but keep it on just the
- /// same for the time being, for subsequent development
+ /// will not use the te name here, but keep it on just the
+ /// same for the time being, for subsequent development
std::string key_collection = key;
std::string key_tename = "";
size_t pos = key_collection.find("/");
@@ -333,18 +330,18 @@ protected:
template<class Collection>
- bool selectTracks( TrigTrackSelector* selector,
- // const TrigCompositeUtils::LinkInfo<TrigRoiDescriptorCollection> roi_link,
+ bool selectTracks( TrigTrackSelector* selector,
+ // const TrigCompositeUtils::LinkInfo<TrigRoiDescriptorCollection> roi_link,
const ElementLink<TrigRoiDescriptorCollection>& roi_link,
const std::string& key="" ) {
- /// will need this printout for debugging the feature access, so leave this commented
+ /// will need this printout for debugging the feature access, so leave this commented
/// until it has been properly debugged, then it can be removed
// std::cout << "try " << key << "\t" << m_provider->evtStore()->template transientContains<Collection>(key) << std::endl;
- /// will not use the te name here, but keep it on just the
- /// same for the time being, for subsequent development
+ /// will not use the te name here, but keep it on just the
+ /// same for the time being, for subsequent development
std::string key_collection = key;
std::string key_tename = "";
size_t pos = key_collection.find("/");
@@ -353,13 +350,13 @@ protected:
key_tename = key.substr( 0, pos );
}
- std::pair< typename Collection::const_iterator,
+ std::pair< typename Collection::const_iterator,
typename Collection::const_iterator > itrpair;
SG::ReadHandle<Collection> handle(key);
itrpair = (*m_tdt)->associateToEventView( handle, roi_link );
-
+
if ( itrpair.first != itrpair.second ) {
selector->selectTracks( itrpair.first, itrpair.second );
return true;
@@ -522,14 +519,14 @@ protected:
std::vector< Trig::Feature<Collection> > trackcollections = citr->get<Collection>( key, TrigDefs::alsoDeactivateTEs );
std::vector<double> v;
if ( !trackcollections.empty() ) {
- // NB!! a combination should never have more than one entry for a track collection from a single algorithm,
- // if ( trackcollections.size()>1 ) std::cerr << "SUTT OH NO!!!!!!!!" << endmsg;
+ // NB!! a combination should never have more than one entry for a track collection from a single algorithm,
+ // if ( trackcollections.size()>1 ) std::cerr << "SUTT OH NO!!!!!!!!" << endmsg;
for ( unsigned ifeat=0 ; ifeat<trackcollections.size() ; ifeat++ ) {
- // std::cout << "selectTracks() ifeat=" << ifeat << "\tkey " << key << std::endl;
+ // std::cout << "selectTracks() ifeat=" << ifeat << "\tkey " << key << std::endl;
Trig::Feature<Collection> trackfeature = trackcollections.at(ifeat);
if ( !trackfeature.empty() ) {
- // m_provider->msg(MSG::DEBUG) << "TDT TrackFeature->size() " << trackfeature.cptr()->size() << " (" << key << ")" << endmsg;
- // actually select the tracks from this roi at last!!
+ // m_provider->msg(MSG::DEBUG) << "TDT TrackFeature->size() " << trackfeature.cptr()->size() << " (" << key << ")" << endmsg;
+ // actually select the tracks from this roi at last!!
const Collection* trigtracks = trackfeature.cptr();
typename Collection::const_iterator trackitr = trigtracks->begin();
@@ -560,8 +557,8 @@ protected:
////////////////////////////////////////////////////////////////////////////////////////////
unsigned processElectrons( TrigTrackSelector& selectorRef,
std::vector<TrackTrigObject>* elevec=0,
- const unsigned int selection=0,
- bool raw_track=false,
+ const unsigned int selection=0,
+ bool raw_track=false,
double ETOffline=0,
# ifdef XAODTRACKING_TRACKPARTICLE_H
const std::string& containerName = "Electrons"
@@ -582,12 +579,12 @@ protected:
const Container* container = 0;
-
+
if( ! m_provider->evtStore()->template contains<Container>(containerName) ) {
m_provider->msg(MSG::WARNING) << "Error No Electron Container " << containerName << " !" << endmsg;
return 0;
}
-
+
StatusCode sc=m_provider->evtStore()->retrieve( container, containerName);
if( sc.isFailure() || !container ) {
m_provider->msg(MSG::WARNING) << "Error retrieving container: " << containerName << " !" << endmsg;
@@ -617,7 +614,7 @@ protected:
good_electron = TIDA::isGoodOffline( *(*elec));
# endif
- if (good_electron) {
+ if (good_electron) {
const xAOD::Electron_v1& eleduff = *(*elec);
long unsigned eleid = (unsigned long)(&eleduff) ;
TrackTrigObject eleobj = TrackTrigObject( (*elec)->eta(),
@@ -626,13 +623,13 @@ protected:
0,
(*elec)->type(),
eleid );
-
+
bool trk_added ;
if ( raw_track ) trk_added = selectorRef.selectTrack( xAOD::EgammaHelpers::getOriginalTrackParticle( *elec ) );
else trk_added = selectorRef.selectTrack( (*elec)->trackParticle() );
-
+
if (trk_added) eleobj.addChild( selectorRef.tracks().back()->id() );
- if (elevec) elevec->push_back( eleobj );
+ if (elevec) elevec->push_back( eleobj );
}
}
@@ -644,7 +641,7 @@ protected:
////////////////////////////////////////////////////////////////////////////////////////////
/// select offlinqe muons
////////////////////////////////////////////////////////////////////////////////////////////
- unsigned processMuons( TrigTrackSelector& selectorRef, const unsigned int selection=0,
+ unsigned processMuons( TrigTrackSelector& selectorRef, const unsigned int selection=0,
double ETOffline=0,
# ifdef XAODTRACKING_TRACKPARTICLE_H
const std::string& containerName = "Muons"
@@ -712,9 +709,9 @@ unsigned processTaus( TrigTrackSelector& selectorRef,
const std::string& containerName = "TauRecContainer"
# endif
) {
-
+
# ifdef XAODTRACKING_TRACKPARTICLE_H
- typedef xAOD::TauJetContainer Container;
+ typedef xAOD::TauJetContainer Container;
# else
typedef Analysis::TauJetContainer Container;
# endif
@@ -731,7 +728,7 @@ unsigned processTaus( TrigTrackSelector& selectorRef,
m_provider->msg(MSG::WARNING) << " Offline taus not found" << endmsg;
return 0;
}
-
+
StatusCode sc = m_provider->evtStore()->retrieve( container, containerName);
if (sc != StatusCode::SUCCESS) {
@@ -759,7 +756,7 @@ unsigned processTaus( TrigTrackSelector& selectorRef,
# endif
# else
- unsigned N = (*tau)->numTrack();
+ unsigned N = (*tau)->numTrack();
# endif
@@ -770,8 +767,8 @@ unsigned processTaus( TrigTrackSelector& selectorRef,
good_tau = TIDA::isGoodOffline( *(*tau), requireNtracks, EtCutOffline );
# endif
- // std::cout << "SUTT tau ntracks: " << N << "\tgoodtau: " << good_tau << "\tpt: " << (*tau)->p4().Et() << "\t3prong: " << doThreeProng << std::endl;
-
+ // std::cout << "SUTT tau ntracks: " << N << "\tgoodtau: " << good_tau << "\tpt: " << (*tau)->p4().Et() << "\t3prong: " << doThreeProng << std::endl;
+
if (good_tau){
const xAOD::TauJet_v3& duff = *(*tau);
long unsigned tauid = (unsigned long)(&duff) ;
@@ -781,10 +778,10 @@ unsigned processTaus( TrigTrackSelector& selectorRef,
0,
(*tau)->type(),
tauid );
-
+
bool trk_added;
for ( unsigned i=N ; i-- ; ) {
-# ifdef XAODTAU_TAUTRACK_H
+# ifdef XAODTAU_TAUTRACK_H
trk_added = selectorRef.selectTrack((*tau)->track(i)->track());
# else
trk_added = selectorRef.selectTrack((*tau)->track(i));
@@ -806,8 +803,6 @@ protected:
Provider* m_provider;
- // MsgStream* m_msg;
- // StoreGateSvc* m_sg;
ToolHandle<Trig::TrigDecisionTool>* m_tdt;
// TrigInDetAnalysis tools
@@ -853,7 +848,7 @@ protected:
bool m_keepAllEvents;
bool m_useHighestPT;
-
+
int m_vtxIndex;
bool m_filterOnRoi;
@@ -866,4 +861,3 @@ protected:
#endif // TrigInDetAnalysisUtils_T_AnalysisConfig_H
-