diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h index 135e1a93450f10cbd25560a3bdad9580bc78b398..ba319be38bf7cee9c4fb5d283253a69ae19366a4 100755 --- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h @@ -29,9 +29,14 @@ class TIDDirectory { public: - TIDDirectory() : mHAddState(true), mDAddState(true), mPop(0), mDir(0) { } + // TIDDirectory() : mHAddState(true), mDAddState(true), mPop(0), mDir(0) { } - TIDDirectory(const std::string& n) : mPop(gDirectory), mDir(0) { + TIDDirectory(const std::string& n="") : mPop(gDirectory), mDir(0) { + + if ( n=="" ) { + mDir = gDirectory; + return; + } if ( n.find("/")==std::string::npos ) { /// only create directory if it doesn't already exist @@ -95,8 +100,8 @@ public: protected: - bool mHAddState; - bool mDAddState; + // bool mHAddState; + // bool mDAddState; TDirectory* mPop; TDirectory* mDir; diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h index ea64a3a0c9aecf6ca8b70df8120764b6e64fae73..4d3b9ac3bde39bf53c281022aa001e33118aa0c8 100644 --- a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h +++ b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TrackAnalysis.h @@ -20,6 +20,7 @@ #include "TrigInDetAnalysis/TrackAssociator.h" #include "TrigInDetAnalysis/Track.h" +#include "TrigInDetAnalysis/TIDAVertex.h" #include "TrigInDetAnalysis/TIDAFeatureStore.h" #include "TH1.h" @@ -46,6 +47,10 @@ public: virtual void execute( const std::vector<TIDA::Track*>& tracks1, const std::vector<TIDA::Track*>& tracks2, TrackAssociator* matcher ) = 0; + + virtual void execute_vtx( const std::vector<TIDA::Vertex*>& , + const std::vector<TIDA::Vertex*>& ) { } + virtual void finalise() = 0;