From 84015cfa141f73b4bfda0c9f6d3964b07366cd4b Mon Sep 17 00:00:00 2001
From: Mark Sutton <mark.sutton@cern.ch>
Date: Sun, 15 May 2016 08:25:07 +0200
Subject: [PATCH] Tier0 vtx analysis (TrigInDetAnalysis-01-01-45)
* TrigInDetAnalysis-01-01-45
* Tier0 vtx analysis
Former-commit-id: 4158b891484c2dcd2d99279ad9ef7b9ff1ddc4ed
---
.../TrigInDetAnalysis/TIDDirectory.h | 13 +++++++++----
.../TrigInDetAnalysis/TrackAnalysis.h | 5 +++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h b/Trigger/TrigAnalysis/TrigInDetAnalysis/TrigInDetAnalysis/TIDDirectory.h
index 135e1a93450f..ba319be38bf7 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 ea64a3a0c9ae..4d3b9ac3bde3 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;
--
GitLab