From: sgorbuno Date: Sat, 2 Aug 2014 10:05:18 +0000 (+0200) Subject: VVvertex interface removed X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=bcbc513f3883326cc203872347f159018de07a50 VVvertex interface removed --- diff --git a/HLT/global/AliFlatESDEvent.h b/HLT/global/AliFlatESDEvent.h index e2900a4526f..c5d14e11916 100644 --- a/HLT/global/AliFlatESDEvent.h +++ b/HLT/global/AliFlatESDEvent.h @@ -92,8 +92,8 @@ class AliFlatESDEvent: public AliVVevent { return reinterpret_cast (fContent + fTracksPointer); } - const AliVVvertex* GetPrimaryVertex() const {return NULL;} - const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;} + //const AliVVvertex* GetPrimaryVertex() const {return NULL;} + //const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;} AliFlatESDTrack* GetTrack(Int_t /*i*/) const {return NULL;} AliVVkink* GetKink(Int_t /*i*/) const {return NULL;} AliFlatESDV0* GetV0(Int_t /*i*/) const {return NULL;} diff --git a/HLT/global/AliFlatESDVertex.h b/HLT/global/AliFlatESDVertex.h index c49130ca089..32f7a182a35 100644 --- a/HLT/global/AliFlatESDVertex.h +++ b/HLT/global/AliFlatESDVertex.h @@ -10,11 +10,10 @@ */ #include "Rtypes.h" -#include "AliVVvertex.h" #include "AliESDVertex.h" #include "AliFlatESDMisc.h" -class AliFlatESDVertex: public AliVVvertex +class AliFlatESDVertex //class AliFlatESDVertex { public: diff --git a/STEER/CMakelibSTEERBase.pkg b/STEER/CMakelibSTEERBase.pkg index d33f553f17b..be243367e9a 100644 --- a/STEER/CMakelibSTEERBase.pkg +++ b/STEER/CMakelibSTEERBase.pkg @@ -5,7 +5,6 @@ set ( SRCS STEERBase/AliVVtrack.cxx STEERBase/AliVVfriendEvent.cxx STEERBase/AliVVfriendTrack.cxx - STEERBase/AliVVvertex.cxx STEERBase/AliVVv0.cxx STEERBase/AliVVkink.cxx STEERBase/AliVVcluster.cxx diff --git a/STEER/STEERBase/AliVVertex.h b/STEER/STEERBase/AliVVertex.h index 02bdb22b622..dd82a674cfd 100644 --- a/STEER/STEERBase/AliVVertex.h +++ b/STEER/STEERBase/AliVVertex.h @@ -9,9 +9,8 @@ //------------------------------------------------------------------------- #include -#include "AliVVvertex.h" -class AliVVertex: public TNamed, public AliVVvertex { +class AliVVertex: public TNamed { public: AliVVertex() : TNamed() { } diff --git a/STEER/STEERBase/AliVVevent.h b/STEER/STEERBase/AliVVevent.h index 049c151ae74..c6f15fdea12 100644 --- a/STEER/STEERBase/AliVVevent.h +++ b/STEER/STEERBase/AliVVevent.h @@ -12,7 +12,7 @@ #include "TString.h" class TList; -class AliVVvertex; +//class AliVVvertex; class AliVVtrack; class AliMultiplicity; class AliVVkink; @@ -31,11 +31,12 @@ class AliVVevent { // -------------------------------------------------------------------------------- // Access methods - + /* virtual const AliVVvertex* GetPrimaryVertex() const {return NULL;} virtual const AliVVvertex* GetPrimaryVertexSPD() const {return NULL;} virtual const AliVVvertex* GetPrimaryVertexTracks() const {return NULL;} - virtual const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;} + virtual const AliVVvertex* GetPrimaryVertexTPC() const {return NULL;} + */ virtual AliVVtrack* GetTrack(Int_t /*i*/) const {return NULL;} virtual AliVVkink* GetKink(Int_t /*i*/) const {return NULL;} virtual AliVVtrack* GetV0(Int_t /*i*/) const {return NULL;} diff --git a/STEER/STEERBase/AliVVvertex.cxx b/STEER/STEERBase/AliVVvertex.cxx deleted file mode 100644 index 0ae7a62677f..00000000000 --- a/STEER/STEERBase/AliVVvertex.cxx +++ /dev/null @@ -1,20 +0,0 @@ -/* $Id$ */ - -/************************************************************************** - * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * * - * Author: The ALICE Off-line Project. * - * Contributors are mentioned in the code where appropriate. * - * * - * Permission to use, copy, modify and distribute this software and its * - * documentation strictly for non-commercial purposes is hereby granted * - * without fee, provided that the above copyright notice appears in all * - * copies and that both the copyright notice and this permission notice * - * appear in the supporting documentation. The authors make no claims * - * about the suitability of this software for any purpose. It is * - * provided "as is" without express or implied warranty. * - **************************************************************************/ - -#include "AliVVvertex.h" - - diff --git a/STEER/STEERBase/AliVVvertex.h b/STEER/STEERBase/AliVVvertex.h deleted file mode 100644 index 7d29fd4976c..00000000000 --- a/STEER/STEERBase/AliVVvertex.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef ALIVVVERTEX_H -#define ALIVVVERTEX_H - -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice * - * Primary Author: Mikolaj Krzewicki - - * >> interface for vertices << - */ - -#include "Rtypes.h" - -class AliVVvertex -{ - public: - AliVVvertex() {} - AliVVvertex(Bool_t) {} - virtual ~AliVVvertex() {} - virtual Double_t GetX() const { return 0; } - virtual Double_t GetY() const { return 0; } - virtual Double_t GetZ() const { return 0; } - virtual void GetXYZ(Double_t pos[3]) const { if (pos[0]) return; } - virtual void GetCovarianceMatrix(Double_t covmatrix[6]) const {if (covmatrix[0]) return;} - virtual Double_t GetChi2perNDF() const { return 0; } - virtual Double_t GetChi2() const { return 0; } - virtual Int_t GetNDF() const{ return 0; } - virtual void PrintIndices() const { return ; } - virtual void Print(Option_t* /*option = ""*/) const {} - virtual Int_t GetBC() const{ return 0; } - virtual void Clear(Option_t* /*option*/) { return ; } - virtual Int_t GetNContributors() const { return 0; } - - ClassDef(AliVVvertex, 1) // base class for vertex data - -}; - -#endif diff --git a/STEER/STEERBaseLinkDef.h b/STEER/STEERBaseLinkDef.h index 3e4a73eb9a4..2b330e6b917 100644 --- a/STEER/STEERBaseLinkDef.h +++ b/STEER/STEERBaseLinkDef.h @@ -142,7 +142,6 @@ #pragma link C++ class AliVVtrack+; #pragma link C++ class AliVVfriendEvent+; #pragma link C++ class AliVVfriendTrack+; -#pragma link C++ class AliVVvertex+; #pragma link C++ class AliVVkink+; #pragma link C++ class AliVVv0+; #pragma link C++ class AliVVcluster+;