From 1f5164764a4df6a3f92bf1704d100a7da1befeb3 Mon Sep 17 00:00:00 2001 From: sgorbuno Date: Wed, 27 Aug 2014 18:21:15 +0200 Subject: [PATCH] AliVVfriend* moved to AliVfriend*, unnecessary AliVV* classes removed --- ANALYSIS/AliAnalysisManager.cxx | 2 +- ANALYSIS/AliAnalysisManager.h | 4 +- HLT/global/AliFlatESDEvent.cxx | 2 +- HLT/global/AliFlatESDEvent.h | 8 +-- HLT/global/AliFlatESDFriend.cxx | 5 +- HLT/global/AliFlatESDFriend.h | 18 +++---- HLT/global/AliFlatESDFriendTrack.cxx | 6 +-- HLT/global/AliFlatESDFriendTrack.h | 12 ++--- HLT/global/AliFlatESDMisc.cxx | 2 - HLT/global/AliFlatESDMisc.h | 15 ------ HLT/global/AliFlatESDTrack.cxx | 2 +- HLT/global/AliFlatESDTrack.h | 6 +-- HLT/global/AliFlatESDTrigger.h | 6 +-- HLT/global/AliFlatESDV0.h | 4 +- HLT/global/AliFlatESDVertex.h | 6 +-- HLT/global/AliFlatTPCCluster.h | 11 ++-- STEER/CMakelibSTEERBase.pkg | 7 --- STEER/ESD/AliESDfriend.cxx | 2 +- STEER/ESD/AliESDfriend.h | 4 +- STEER/ESD/AliESDfriendTrack.cxx | 8 +-- STEER/ESD/AliESDfriendTrack.h | 6 +-- STEER/ESD/AliESDkink.h | 3 +- STEER/ESD/AliTrackPointArray.cxx | 6 +-- STEER/ESD/AliTrackPointArray.h | 12 ++--- STEER/STEER/AliHLTTestInputHandler.cxx | 4 +- STEER/STEER/AliHLTTestInputHandler.h | 10 ++-- STEER/STEERBase/AliExternalTrackParam.h | 6 +-- STEER/STEERBase/AliVEvent.h | 2 +- STEER/STEERBase/AliVEventHandler.h | 6 +-- STEER/STEERBase/{AliVVMisc.h => AliVMisc.h} | 8 +-- STEER/STEERBase/AliVParticle.h | 4 +- .../{AliVVTPCseed.h => AliVTPCseed.h} | 11 ++-- STEER/STEERBase/AliVTrack.h | 4 +- STEER/STEERBase/AliVVTPCseed.cxx | 1 - STEER/STEERBase/AliVVTRDseed.cxx | 1 - STEER/STEERBase/AliVVTRDseed.h | 16 ------ STEER/STEERBase/AliVVcluster.cxx | 1 - STEER/STEERBase/AliVVcluster.h | 30 ----------- STEER/STEERBase/AliVVevent.h | 8 +-- STEER/STEERBase/AliVVfriendEvent.cxx | 1 - STEER/STEERBase/AliVVfriendTrack.cxx | 1 - STEER/STEERBase/AliVVfriendTrack.h | 39 -------------- STEER/STEERBase/AliVVkink.cxx | 20 ------- STEER/STEERBase/AliVVkink.h | 21 -------- STEER/STEERBase/AliVVtrack.h | 6 +-- STEER/STEERBase/AliVVtrackPoint.cxx | 2 - STEER/STEERBase/AliVVtrackPoint.h | 52 ------------------- STEER/STEERBase/AliVVtrackPointArray.cxx | 2 - STEER/STEERBase/AliVVtrackPointArray.h | 18 ------- .../{AliVVfriendEvent.h => AliVfriendEvent.h} | 20 +++---- STEER/STEERBase/AliVfriendTrack.h | 39 ++++++++++++++ STEER/STEERBaseLinkDef.h | 7 --- TPC/Calib/AliAnalysisTaskPt.cxx | 8 +-- TPC/Calib/AliAnalysisTaskPt.h | 4 +- TPC/Rec/AliTPCseed.h | 4 +- 55 files changed, 155 insertions(+), 358 deletions(-) delete mode 100644 HLT/global/AliFlatESDMisc.cxx delete mode 100644 HLT/global/AliFlatESDMisc.h rename STEER/STEERBase/{AliVVMisc.h => AliVMisc.h} (52%) rename STEER/STEERBase/{AliVVTPCseed.h => AliVTPCseed.h} (68%) delete mode 100644 STEER/STEERBase/AliVVTPCseed.cxx delete mode 100644 STEER/STEERBase/AliVVTRDseed.cxx delete mode 100644 STEER/STEERBase/AliVVTRDseed.h delete mode 100644 STEER/STEERBase/AliVVcluster.cxx delete mode 100644 STEER/STEERBase/AliVVcluster.h delete mode 100644 STEER/STEERBase/AliVVfriendEvent.cxx delete mode 100644 STEER/STEERBase/AliVVfriendTrack.cxx delete mode 100644 STEER/STEERBase/AliVVfriendTrack.h delete mode 100644 STEER/STEERBase/AliVVkink.cxx delete mode 100644 STEER/STEERBase/AliVVkink.h delete mode 100644 STEER/STEERBase/AliVVtrackPoint.cxx delete mode 100644 STEER/STEERBase/AliVVtrackPoint.h delete mode 100644 STEER/STEERBase/AliVVtrackPointArray.cxx delete mode 100644 STEER/STEERBase/AliVVtrackPointArray.h rename STEER/STEERBase/{AliVVfriendEvent.h => AliVfriendEvent.h} (50%) create mode 100644 STEER/STEERBase/AliVfriendTrack.h diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx index 33b9ef49a33..ce09386a5d8 100644 --- a/ANALYSIS/AliAnalysisManager.cxx +++ b/ANALYSIS/AliAnalysisManager.cxx @@ -2950,7 +2950,7 @@ void AliAnalysisManager::Changed() } //______________________________________________________________________________ -void AliAnalysisManager::InitInputData(AliVVevent* esdEvent, AliVVfriendEvent* esdFriend) +void AliAnalysisManager::InitInputData(AliVVevent* esdEvent, AliVfriendEvent* esdFriend) { // Method to propagte to all the connected tasks the HLT event. diff --git a/ANALYSIS/AliAnalysisManager.h b/ANALYSIS/AliAnalysisManager.h index f2d56f325fb..d882ea8d6bb 100644 --- a/ANALYSIS/AliAnalysisManager.h +++ b/ANALYSIS/AliAnalysisManager.h @@ -37,7 +37,7 @@ class AliVEventPool; class AliAnalysisGrid; class AliAnalysisStatistics; class AliVVevent; -class AliVVfriendEvent; +class AliVfriendEvent; class AliAnalysisManager : public TNamed { @@ -230,7 +230,7 @@ enum EAliAnalysisFlags { void Lock(); void UnLock(); void Changed(); - void InitInputData(AliVVevent* esdEvent, AliVVfriendEvent* esdFriend); + void InitInputData(AliVVevent* esdEvent, AliVfriendEvent* esdFriend); protected: void CreateReadCache(); void ImportWrappers(TList *source); diff --git a/HLT/global/AliFlatESDEvent.cxx b/HLT/global/AliFlatESDEvent.cxx index 7cfc3f719f3..9458e6bb20e 100644 --- a/HLT/global/AliFlatESDEvent.cxx +++ b/HLT/global/AliFlatESDEvent.cxx @@ -98,7 +98,7 @@ AliFlatESDEvent::AliFlatESDEvent() } -AliFlatESDEvent::AliFlatESDEvent( AliVVConstructorReinitialisationFlag f ) +AliFlatESDEvent::AliFlatESDEvent( AliVConstructorReinitialisationFlag f ) : AliVVevent( f ), fContentSize(fContentSize), diff --git a/HLT/global/AliFlatESDEvent.h b/HLT/global/AliFlatESDEvent.h index df0aa8c6167..c7f2a66cb57 100644 --- a/HLT/global/AliFlatESDEvent.h +++ b/HLT/global/AliFlatESDEvent.h @@ -10,7 +10,7 @@ */ #include "Rtypes.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" #include "AliVVevent.h" #include "AliFlatESDTrack.h" #include "AliFlatESDVertex.h" @@ -31,8 +31,8 @@ class AliFlatESDEvent :public AliVVevent { ~AliFlatESDEvent() {} // constructor and method for reinitialisation of virtual table - AliFlatESDEvent( AliVVConstructorReinitialisationFlag ); - void Reinitialize() { new (this) AliFlatESDEvent( AliVVReinitialize ); } + AliFlatESDEvent( AliVConstructorReinitialisationFlag ); + void Reinitialize() { new (this) AliFlatESDEvent( AliVReinitialize ); } // -------------------------------------------------------------------------------- // Interface to AliVVEvent @@ -62,7 +62,7 @@ class AliFlatESDEvent :public AliVVevent { Int_t GetPrimaryVertexSPD( AliESDVertex &v ) const ; Int_t GetPrimaryVertexTracks( AliESDVertex &v ) const ; - AliVVfriendEvent* FindFriend() const { return fFriendEvent; } + AliVfriendEvent* FindFriend() const { return fFriendEvent; } // -------------------------------------------------------------------------------- // Own methods diff --git a/HLT/global/AliFlatESDFriend.cxx b/HLT/global/AliFlatESDFriend.cxx index 41ece91b7d0..dfe44a1866d 100644 --- a/HLT/global/AliFlatESDFriend.cxx +++ b/HLT/global/AliFlatESDFriend.cxx @@ -69,7 +69,8 @@ void AliFlatESDFriend::Reset() } // _______________________________________________________________________________________________________ -AliFlatESDFriend::AliFlatESDFriend(AliFlatESDSpecialConstructorFlag f) : +AliFlatESDFriend::AliFlatESDFriend(AliVConstructorReinitialisationFlag f) : + AliVfriendEvent(), fContentSize(), fBitFlags(), fNTracks(), @@ -83,7 +84,7 @@ AliFlatESDFriend::AliFlatESDFriend(AliFlatESDSpecialConstructorFlag f) : // the vtable pointer for this AliFlatESDFriend object is already reset when this constructor is called // we should only initialise vtable pointers for all contained objects - if(f == AliFlatESDReinitialize){ + if(f == AliVReinitialize){ for( int i=0; iReinitialize(); diff --git a/HLT/global/AliFlatESDFriend.h b/HLT/global/AliFlatESDFriend.h index 51348b3f7b5..885a1d33c4f 100644 --- a/HLT/global/AliFlatESDFriend.h +++ b/HLT/global/AliFlatESDFriend.h @@ -10,24 +10,24 @@ */ #include "Rtypes.h" -#include "AliFlatESDMisc.h" -#include "AliVVfriendEvent.h" +#include "AliVMisc.h" +#include "AliVfriendEvent.h" #include "AliFlatESDFriendTrack.h" class AliVVVZEROfriend; class AliVVTZEROfriend; //_____________________________________________________________________________ -class AliFlatESDFriend : public AliVVfriendEvent { +class AliFlatESDFriend : public AliVfriendEvent { public: AliFlatESDFriend(); ~AliFlatESDFriend() {} - // Implementation of virtual methods of AliVVfriend + // Implementation of virtual methods of AliVfriend Int_t GetNumberOfTracks() const { return fNTracks; } Int_t GetEntriesInTracks() const { return fNTrackEntries; } - const AliVVfriendTrack* GetTrack(Int_t i) const {return GetFlatTrack(i); } + const AliVfriendTrack* GetTrack(Int_t i) const {return GetFlatTrack(i); } AliVVVZEROfriend *GetVZEROfriend(){ return NULL; } AliVVTZEROfriend *GetTZEROfriend(){ return NULL; } @@ -41,8 +41,8 @@ public: Int_t GetNclustersTPC(UInt_t sector) const { return (sector<72)?fNclustersTPC[sector]:0; } Int_t GetNclustersTPCused(UInt_t sector) const { return (sector<72)?fNclustersTPCused[sector]:0; } - //virtual void AddTrack(const AliVVfriendTrack *t) {} - //virtual void AddTrackAt(const AliVVfriendTrack* /*t*/, Int_t /*i*/) {} + //virtual void AddTrack(const AliVfriendTrack *t) {} + //virtual void AddTrackAt(const AliVfriendTrack* /*t*/, Int_t /*i*/) {} //virtual void SetVZEROfriend(AliESDVZEROfriend* /*obj*/) {} //virtual void SetTZEROfriend(AliESDTZEROfriend * obj) {} //void SetSkipBit(Bool_t skip){} @@ -65,7 +65,7 @@ public: void Reinitialize() { - new (this) AliFlatESDFriend(AliFlatESDReinitialize); + new (this) AliFlatESDFriend(AliVReinitialize); } private: @@ -76,7 +76,7 @@ private: // special constructor, to be called by placement new, // when accessing information after reinterpret_cast // so that vtable is generated, but values are not overwritten - AliFlatESDFriend(AliFlatESDSpecialConstructorFlag); + AliFlatESDFriend(AliVConstructorReinitialisationFlag); AliFlatESDFriendTrack *GetFlatTrackNonConst( Int_t i ){ const Long64_t *table = reinterpret_cast (fContent + fTrackTablePointer); diff --git a/HLT/global/AliFlatESDFriendTrack.cxx b/HLT/global/AliFlatESDFriendTrack.cxx index 33440390ab3..a65ce132676 100644 --- a/HLT/global/AliFlatESDFriendTrack.cxx +++ b/HLT/global/AliFlatESDFriendTrack.cxx @@ -37,13 +37,13 @@ // _______________________________________________________________________________________________________ AliFlatESDFriendTrack::AliFlatESDFriendTrack() : - AliVVfriendTrack() + AliVfriendTrack() { // Default constructor } -AliFlatESDFriendTrack::AliFlatESDFriendTrack( AliVVConstructorReinitialisationFlag f ) : -AliVVfriendTrack( f ) +AliFlatESDFriendTrack::AliFlatESDFriendTrack( AliVConstructorReinitialisationFlag f ) : +AliVfriendTrack( f ) { // constructor for reinitialisation of vtable } diff --git a/HLT/global/AliFlatESDFriendTrack.h b/HLT/global/AliFlatESDFriendTrack.h index 1405b0881d9..3b90be6dd27 100644 --- a/HLT/global/AliFlatESDFriendTrack.h +++ b/HLT/global/AliFlatESDFriendTrack.h @@ -19,8 +19,8 @@ Op - Track parameters estimated at the point of maximal radial coordinate reache #include "Rtypes.h" #include "AliFlatTPCCluster.h" -#include "AliVVfriendTrack.h" -#include "AliVVMisc.h" +#include "AliVfriendTrack.h" +#include "AliVMisc.h" class AliESDtrack; class AliESDfriendTrack; @@ -28,15 +28,15 @@ class AliExternalTrackParam; class AliTrackPointArray; class AliTPCseed; -class AliFlatESDFriendTrack :public AliVVfriendTrack +class AliFlatESDFriendTrack :public AliVfriendTrack { public: AliFlatESDFriendTrack(); ~AliFlatESDFriendTrack() {} // constructor for reinitialisation of virtual table - AliFlatESDFriendTrack( AliVVConstructorReinitialisationFlag ); + AliFlatESDFriendTrack( AliVConstructorReinitialisationFlag ); - //implementation of AliVVfriendTrack methods + //implementation of AliVfriendTrack methods Int_t GetTPCseed( AliTPCseed &) const {return -1;} //AliVVTPCseed* GetTPCseed() const {return NULL;} @@ -52,7 +52,7 @@ class AliFlatESDFriendTrack :public AliVVfriendTrack // own methods - void Reinitialize() { new (this) AliFlatESDFriendTrack( AliVVReinitialize ); } + void Reinitialize() { new (this) AliFlatESDFriendTrack( AliVReinitialize ); } private: diff --git a/HLT/global/AliFlatESDMisc.cxx b/HLT/global/AliFlatESDMisc.cxx deleted file mode 100644 index fec343ad789..00000000000 --- a/HLT/global/AliFlatESDMisc.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "AliFlatESDMisc.h" - diff --git a/HLT/global/AliFlatESDMisc.h b/HLT/global/AliFlatESDMisc.h deleted file mode 100644 index 8d0217b8ad6..00000000000 --- a/HLT/global/AliFlatESDMisc.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef ALIFLATESDMISC_H -#define ALIFLATESDMISC_H - -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice * - * Primary Authors : Steffen Weber */ - - - -enum AliFlatESDSpecialConstructorFlag{AliFlatESDReinitialize}; - -typedef enum AliFlatESDSpecialConstructorFlag AliFlatESDSpecialConstructorFlag; - - -#endif diff --git a/HLT/global/AliFlatESDTrack.cxx b/HLT/global/AliFlatESDTrack.cxx index 24d05fad3d8..9c2a4875723 100644 --- a/HLT/global/AliFlatESDTrack.cxx +++ b/HLT/global/AliFlatESDTrack.cxx @@ -48,7 +48,7 @@ AliFlatESDTrack::AliFlatESDTrack() : { } -AliFlatESDTrack::AliFlatESDTrack( AliVVConstructorReinitialisationFlag f ) +AliFlatESDTrack::AliFlatESDTrack( AliVConstructorReinitialisationFlag f ) : AliVVtrack( f ), fTrackParamMask(fTrackParamMask ), diff --git a/HLT/global/AliFlatESDTrack.h b/HLT/global/AliFlatESDTrack.h index 176d038f025..59e47d23447 100644 --- a/HLT/global/AliFlatESDTrack.h +++ b/HLT/global/AliFlatESDTrack.h @@ -17,7 +17,7 @@ Op - Track parameters estimated at the point of maximal radial coordinate reache */ #include "Rtypes.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" #include "AliVVtrack.h" #include "AliFlatExternalTrackParam.h" @@ -33,8 +33,8 @@ class AliFlatESDTrack :public AliVVtrack { ~AliFlatESDTrack() {} // constructor and method for reinitialisation of virtual table - AliFlatESDTrack( AliVVConstructorReinitialisationFlag ); - void Reinitialize() { new (this) AliFlatESDTrack( AliVVReinitialize ); } + AliFlatESDTrack( AliVConstructorReinitialisationFlag ); + void Reinitialize() { new (this) AliFlatESDTrack( AliVReinitialize ); } // -------------------- AliVVtrack interface --------------------------------- diff --git a/HLT/global/AliFlatESDTrigger.h b/HLT/global/AliFlatESDTrigger.h index e692263a0dd..9ce9e3b194d 100644 --- a/HLT/global/AliFlatESDTrigger.h +++ b/HLT/global/AliFlatESDTrigger.h @@ -13,7 +13,7 @@ */ #include "Rtypes.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" #include class AliFlatESDTrigger{ @@ -26,7 +26,7 @@ class AliFlatESDTrigger{ ~AliFlatESDTrigger(); // constructor and method for reinitialisation of virtual table - AliFlatESDTrigger( AliVVConstructorReinitialisationFlag ); + AliFlatESDTrigger( AliVConstructorReinitialisationFlag ); void Reinitialize() const {} // no virtual table - do nothing // -------------------------------------------------------------------------------- @@ -87,7 +87,7 @@ inline AliFlatESDTrigger::~AliFlatESDTrigger() // Destructor } -inline AliFlatESDTrigger::AliFlatESDTrigger( AliVVConstructorReinitialisationFlag ) : +inline AliFlatESDTrigger::AliFlatESDTrigger( AliVConstructorReinitialisationFlag ) : fContentSize(fContentSize), fTriggerIndex(fTriggerIndex) { diff --git a/HLT/global/AliFlatESDV0.h b/HLT/global/AliFlatESDV0.h index 61df695dd4b..da827c1404e 100644 --- a/HLT/global/AliFlatESDV0.h +++ b/HLT/global/AliFlatESDV0.h @@ -10,7 +10,7 @@ */ #include "Rtypes.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" class AliFlatESDV0 { @@ -22,7 +22,7 @@ class AliFlatESDV0 ~AliFlatESDV0(){} // constructor and method for reinitialisation of virtual table - AliFlatESDV0( AliVVConstructorReinitialisationFlag ): fNegTrackID(fNegTrackID), fPosTrackID(fPosTrackID) {} + AliFlatESDV0( AliVConstructorReinitialisationFlag ): fNegTrackID(fNegTrackID), fPosTrackID(fPosTrackID) {} void Reinitialize() const {} // no virtual table - do nothing //-- diff --git a/HLT/global/AliFlatESDVertex.h b/HLT/global/AliFlatESDVertex.h index bd1c64a0cce..a13299ef710 100644 --- a/HLT/global/AliFlatESDVertex.h +++ b/HLT/global/AliFlatESDVertex.h @@ -10,7 +10,7 @@ */ #include "Rtypes.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" #include "AliESDVertex.h" struct AliFlatESDVertex @@ -21,7 +21,7 @@ struct AliFlatESDVertex ~AliFlatESDVertex() {} // constructor and method for reinitialisation of virtual table - AliFlatESDVertex( AliVVConstructorReinitialisationFlag ); + AliFlatESDVertex( AliVConstructorReinitialisationFlag ); void Reinitialize() const {} // no virtual table - do nothing //-- @@ -109,7 +109,7 @@ fChi2(0) for( int i=0; i<6; i++) fCov[i] = -9999; } -inline AliFlatESDVertex::AliFlatESDVertex( AliVVConstructorReinitialisationFlag ): +inline AliFlatESDVertex::AliFlatESDVertex( AliVConstructorReinitialisationFlag ): fNContributors(fNContributors), fChi2(fChi2) { diff --git a/HLT/global/AliFlatTPCCluster.h b/HLT/global/AliFlatTPCCluster.h index a6401a9fc10..463fdc1764d 100644 --- a/HLT/global/AliFlatTPCCluster.h +++ b/HLT/global/AliFlatTPCCluster.h @@ -10,10 +10,9 @@ */ #include "Rtypes.h" -#include "AliVVcluster.h" -#include "AliFlatESDMisc.h" +#include "AliVMisc.h" -class AliFlatTPCCluster: public AliVVcluster +class AliFlatTPCCluster { public: @@ -29,9 +28,7 @@ class AliFlatTPCCluster: public AliVVcluster void SetCharge(UShort_t charge) {fCharge = charge;} void SetQMax(UShort_t qmax) {fQMax = qmax;} - void Reinitialize(){ - new (this) AliFlatTPCCluster(AliFlatESDReinitialize); - } + void Reinitialize(){} // do nothing Float_t GetX() const {return fX;} Float_t GetY() const {return fY;} @@ -52,7 +49,7 @@ class AliFlatTPCCluster: public AliVVcluster private: - AliFlatTPCCluster(AliFlatESDSpecialConstructorFlag f): AliVVcluster(f),fX(fX),fY(fY),fZ(fZ),fPadRow(fPadRow),fSigmaY2(fSigmaY2),fSigmaZ2(fSigmaZ2),fCharge(fCharge),fQMax(fQMax){} + AliFlatTPCCluster(AliVConstructorReinitialisationFlag ): fX(fX),fY(fY),fZ(fZ),fPadRow(fPadRow),fSigmaY2(fSigmaY2),fSigmaZ2(fSigmaZ2),fCharge(fCharge),fQMax(fQMax){} Float_t fX; // X coordinate in local coordinates Float_t fY; // Y coordinate in local coordinates diff --git a/STEER/CMakelibSTEERBase.pkg b/STEER/CMakelibSTEERBase.pkg index 4fedd1030f2..da7c3b0cc5f 100644 --- a/STEER/CMakelibSTEERBase.pkg +++ b/STEER/CMakelibSTEERBase.pkg @@ -3,13 +3,6 @@ set ( SRCS STEERBase/AliVVevent.cxx STEERBase/AliVVtrack.cxx - STEERBase/AliVVfriendEvent.cxx - STEERBase/AliVVfriendTrack.cxx - STEERBase/AliVVkink.cxx - STEERBase/AliVVcluster.cxx - STEERBase/AliVVtrackPointArray.cxx - STEERBase/AliVVtrackPoint.cxx - STEERBase/AliVVTPCseed.cxx STEERBase/AliVParticle.cxx STEERBase/AliVTrack.cxx STEERBase/AliEventplane.cxx diff --git a/STEER/ESD/AliESDfriend.cxx b/STEER/ESD/AliESDfriend.cxx index 3cd90b653e7..c4e96b6cb3c 100644 --- a/STEER/ESD/AliESDfriend.cxx +++ b/STEER/ESD/AliESDfriend.cxx @@ -44,7 +44,7 @@ AliESDfriend::AliESDfriend(): TObject(), fTracks("AliESDfriendTrack",1), AliESDfriend::AliESDfriend(const AliESDfriend &f) : TObject(f), - AliVVfriendEvent(), + AliVfriendEvent(), fTracks(f.fTracks), fESDVZEROfriend(f.fESDVZEROfriend ? new AliESDVZEROfriend(*f.fESDVZEROfriend) : NULL), fESDTZEROfriend(f.fESDTZEROfriend ? new AliESDTZEROfriend(*f.fESDTZEROfriend) : NULL), diff --git a/STEER/ESD/AliESDfriend.h b/STEER/ESD/AliESDfriend.h index 2284cd6b261..78d7e6b4003 100644 --- a/STEER/ESD/AliESDfriend.h +++ b/STEER/ESD/AliESDfriend.h @@ -11,13 +11,13 @@ #include #include "AliESDfriendTrack.h" -#include "AliVVfriendEvent.h" +#include "AliVfriendEvent.h" class AliESDVZEROfriend; class AliESDTZEROfriend; //_____________________________________________________________________________ -class AliESDfriend : public TObject, public AliVVfriendEvent { +class AliESDfriend : public TObject, public AliVfriendEvent { public: AliESDfriend(); AliESDfriend(const AliESDfriend &); diff --git a/STEER/ESD/AliESDfriendTrack.cxx b/STEER/ESD/AliESDfriendTrack.cxx index d21b83e3702..fc6a345a596 100644 --- a/STEER/ESD/AliESDfriendTrack.cxx +++ b/STEER/ESD/AliESDfriendTrack.cxx @@ -23,7 +23,7 @@ #include "TObjArray.h" #include "TClonesArray.h" #include "AliKalmanTrack.h" -#include "AliVVTPCseed.h" +#include "AliVTPCseed.h" ClassImp(AliESDfriendTrack) @@ -61,7 +61,7 @@ fTRDIn(0) AliESDfriendTrack::AliESDfriendTrack(const AliESDfriendTrack &t): TObject(t), -AliVVfriendTrack(), +AliVfriendTrack(), f1P(t.f1P), fnMaxITScluster(t.fnMaxITScluster), fnMaxTPCcluster(t.fnMaxTPCcluster), @@ -152,9 +152,9 @@ TObject * AliESDfriendTrack::GetCalibObject(Int_t index) const { Int_t AliESDfriendTrack::GetTPCseed( AliTPCseed &seed) const { TObject* calibObject = NULL; - AliVVTPCseed* seedP = NULL; + AliVTPCseed* seedP = NULL; for (Int_t idx = 0; (calibObject = GetCalibObject(idx)); ++idx) { - if ((seedP = dynamic_cast(calibObject))) { + if ((seedP = dynamic_cast(calibObject))) { seedP->CopyToTPCseed( seed ); return 0; } diff --git a/STEER/ESD/AliESDfriendTrack.h b/STEER/ESD/AliESDfriendTrack.h index 56a950c631b..d20701d8ab4 100644 --- a/STEER/ESD/AliESDfriendTrack.h +++ b/STEER/ESD/AliESDfriendTrack.h @@ -10,7 +10,7 @@ #include #include #include -#include "AliVVfriendTrack.h" +#include "AliVfriendTrack.h" #include "AliTrackPointArray.h" class AliKalmanTrack; @@ -19,7 +19,7 @@ class AliTPCseed; //_____________________________________________________________________________ -class AliESDfriendTrack : public TObject, public AliVVfriendTrack { +class AliESDfriendTrack : public TObject, public AliVfriendTrack { public: enum { kMaxITScluster=12, @@ -70,7 +70,7 @@ public: void SetSkipBit(Bool_t skip){SetBit(23,skip);} Bool_t TestSkipBit() {return TestBit(23);} - // VVfriendTrack interface + // VfriendTrack interface Int_t GetTPCseed( AliTPCseed &) const; diff --git a/STEER/ESD/AliESDkink.h b/STEER/ESD/AliESDkink.h index 7435da66983..92cc38720b1 100644 --- a/STEER/ESD/AliESDkink.h +++ b/STEER/ESD/AliESDkink.h @@ -15,11 +15,10 @@ #include #include "AliExternalTrackParam.h" #include -#include "AliVVkink.h" class AliESDtrack; -class AliESDkink : public TObject, public AliVVkink { +class AliESDkink : public TObject { public: AliESDkink(); //constructor AliESDkink(const AliESDkink &source); //constructor diff --git a/STEER/ESD/AliTrackPointArray.cxx b/STEER/ESD/AliTrackPointArray.cxx index 40dfa6326be..3b507418e64 100644 --- a/STEER/ESD/AliTrackPointArray.cxx +++ b/STEER/ESD/AliTrackPointArray.cxx @@ -220,7 +220,7 @@ Bool_t AliTrackPointArray::AddPoint(Int_t i, const AliTrackPoint *p) //______________________________________________________________________________ -Bool_t AliTrackPointArray::GetPoint(AliVVtrackPoint &p, Int_t i) const +Bool_t AliTrackPointArray::GetPoint(AliTrackPoint &p, Int_t i) const { // Get the point at position i // @@ -433,7 +433,7 @@ void AliTrackPoint::GetXYZ(Float_t *xyz, Float_t *cov) const } //______________________________________________________________________________ -Float_t AliTrackPoint::GetResidual(const AliVVtrackPoint &p, Bool_t weighted) const +Float_t AliTrackPoint::GetResidual(const AliTrackPoint &p, Bool_t weighted) const { // This method calculates the track to space-point residuals. The track // interpolation is also stored as AliTrackPoint. Using the option @@ -478,7 +478,7 @@ Float_t AliTrackPoint::GetResidual(const AliVVtrackPoint &p, Bool_t weighted) co } //_____________________________________________________________________________ -Bool_t AliTrackPoint::GetPCA(const AliVVtrackPoint &p, AliVVtrackPoint &out) const +Bool_t AliTrackPoint::GetPCA(const AliTrackPoint &p, AliTrackPoint &out) const { // // Get the intersection point between this point and diff --git a/STEER/ESD/AliTrackPointArray.h b/STEER/ESD/AliTrackPointArray.h index cdacbb2bb07..9025df0c162 100644 --- a/STEER/ESD/AliTrackPointArray.h +++ b/STEER/ESD/AliTrackPointArray.h @@ -14,13 +14,11 @@ #include #include -#include "AliVVtrackPointArray.h" -#include "AliVVtrackPoint.h" #include "Rtypes.h" class TGeoRotation; -class AliTrackPoint : public AliVVtrackPoint, public TObject { +class AliTrackPoint : public TObject { public: AliTrackPoint(); @@ -54,8 +52,8 @@ class AliTrackPoint : public AliVVtrackPoint, public TObject { Int_t GetClusterType() const { return fClusterType;} Bool_t IsExtra() const { return fIsExtra;} - Float_t GetResidual(const AliVVtrackPoint &p, Bool_t weighted = kFALSE) const; - Bool_t GetPCA(const AliVVtrackPoint &p, AliVVtrackPoint &out) const; + Float_t GetResidual(const AliTrackPoint &p, Bool_t weighted = kFALSE) const; + Bool_t GetPCA(const AliTrackPoint &p, AliTrackPoint &out) const; Float_t GetAngle() const; Bool_t GetRotMatrix(TGeoRotation& rot) const; @@ -91,7 +89,7 @@ class AliTrackPoint : public AliVVtrackPoint, public TObject { // cvetan.cheshkov@cern.ch 3/11/2005 // ////////////////////////////////////////////////////////////////////////////// -class AliTrackPointArray : public TObject, public AliVVtrackPointArray { +class AliTrackPointArray : public TObject { public: @@ -106,7 +104,7 @@ class AliTrackPointArray : public TObject, public AliVVtrackPointArray { Int_t GetNPoints() const { return fNPoints; } Int_t GetCovSize() const { return fSize; } - Bool_t GetPoint(AliVVtrackPoint &p, Int_t i) const; + Bool_t GetPoint(AliTrackPoint &p, Int_t i) const; // Getters for fast access to the coordinate arrays const Float_t* GetX() const { return &fX[0]; } const Float_t* GetY() const { return &fY[0]; } diff --git a/STEER/STEER/AliHLTTestInputHandler.cxx b/STEER/STEER/AliHLTTestInputHandler.cxx index 3b21a32b31d..c835dcd6fa7 100644 --- a/STEER/STEER/AliHLTTestInputHandler.cxx +++ b/STEER/STEER/AliHLTTestInputHandler.cxx @@ -54,14 +54,14 @@ Bool_t AliHLTTestInputHandler::BeginEvent(Long64_t) } //______________________________________________________________________________ -Bool_t AliHLTTestInputHandler::InitTaskInputData(AliVVevent* esdEvent, AliVVfriendEvent* friendEvent, TObjArray* arrTasks) { +Bool_t AliHLTTestInputHandler::InitTaskInputData(AliVVevent* esdEvent, AliVfriendEvent* friendEvent, TObjArray* arrTasks) { // Method to propagte to all the connected tasks the HLT event. // The method gets the list of tasks from the manager Printf("----> AliHLTTestInputHandler::InitTaskInpuData: Setting the event..."); SetVVEvent(esdEvent); - SetVVFriendEvent(friendEvent); + SetVFriendEvent(friendEvent); // set transient pointer to event inside tracks fEvent->ConnectTracks(); Printf("----> AliHLTTestInputHandler::InitTaskInpuData: ...Event set"); diff --git a/STEER/STEER/AliHLTTestInputHandler.h b/STEER/STEER/AliHLTTestInputHandler.h index 35258d7155c..b24ec0cee6b 100644 --- a/STEER/STEER/AliHLTTestInputHandler.h +++ b/STEER/STEER/AliHLTTestInputHandler.h @@ -14,7 +14,7 @@ class TObjArray; class AliVVevent; -class AliVVfriendevent; +class AliVfriendevent; class AliHLTTestInputHandler : public AliVEventHandler { @@ -38,21 +38,21 @@ class AliHLTTestInputHandler : public AliVEventHandler { virtual Bool_t TerminateIO() {return kTRUE;} // Especially needed for HLT - Bool_t InitTaskInputData(AliVVevent* /*esdEvent*/, AliVVfriendEvent* /*friendEvent*/, TObjArray* /*arrTasks*/); + Bool_t InitTaskInputData(AliVVevent* /*esdEvent*/, AliVfriendEvent* /*friendEvent*/, TObjArray* /*arrTasks*/); AliVEvent* GetEvent() const {return NULL;} AliVVevent* GetVVEvent() const {return fEvent;} void SetVVEvent(AliVVevent *event) {fEvent = event;} - AliVVfriendEvent* GetVVFriendEvent() const {return fFriendEvent;} - void SetVVFriendEvent(AliVVfriendEvent *friendEvent) {fFriendEvent = friendEvent;} + AliVfriendEvent* GetVFriendEvent() const {return fFriendEvent;} + void SetVFriendEvent(AliVfriendEvent *friendEvent) {fFriendEvent = friendEvent;} private: AliHLTTestInputHandler(const AliVEventHandler& handler); AliHLTTestInputHandler& operator=(const AliVEventHandler& handler); AliVVevent *fEvent; //! Pointer to the event - AliVVfriendEvent *fFriendEvent; //! Pointer to the friend event + AliVfriendEvent *fFriendEvent; //! Pointer to the friend event ClassDef(AliHLTTestInputHandler, 1); }; diff --git a/STEER/STEERBase/AliExternalTrackParam.h b/STEER/STEERBase/AliExternalTrackParam.h index 56725de3277..15b1f5e6544 100644 --- a/STEER/STEERBase/AliExternalTrackParam.h +++ b/STEER/STEERBase/AliExternalTrackParam.h @@ -21,7 +21,7 @@ #include "TMath.h" #include "AliVTrack.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" const Double_t kVeryBig=1./kAlmost0; const Double_t kMostProbablePt=0.35; @@ -44,8 +44,8 @@ class AliExternalTrackParam: public AliVTrack { AliExternalTrackParam(Double_t xyz[3],Double_t pxpypz[3], Double_t cv[21],Short_t sign); // constructor for reinitialisation of vtable - AliExternalTrackParam( AliVVConstructorReinitialisationFlag f) :AliVTrack(f), fX(), fAlpha(){} - void Reinitialize() { new (this) AliExternalTrackParam( AliVVReinitialize ); } + AliExternalTrackParam( AliVConstructorReinitialisationFlag f) :AliVTrack(f), fX(), fAlpha(){} + void Reinitialize() { new (this) AliExternalTrackParam( AliVReinitialize ); } virtual ~AliExternalTrackParam(){} void CopyFromVTrack(const AliVTrack *vTrack); diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h index 961957e035f..cdfe54d7007 100644 --- a/STEER/STEERBase/AliVEvent.h +++ b/STEER/STEERBase/AliVEvent.h @@ -40,7 +40,7 @@ class AliVEvent : public TObject, virtual public AliVVevent { UInt_t GetTimeStamp() const { return 0; } UInt_t GetEventSpecie() const { return 0; } ULong64_t GetTriggerMaskNext50() const { return 0; } - AliVVfriendEvent* FindFriend() const { return 0; } + AliVfriendEvent* FindFriend() const { return 0; } Int_t GetNumberOfKinks() const { return 0; } diff --git a/STEER/STEERBase/AliVEventHandler.h b/STEER/STEERBase/AliVEventHandler.h index b0e80a009c9..f3d77130609 100644 --- a/STEER/STEERBase/AliVEventHandler.h +++ b/STEER/STEERBase/AliVEventHandler.h @@ -16,7 +16,7 @@ class TTree; class TObjArray; class AliVVevent; class AliVEvent; -class AliVVfriendEvent; +class AliVfriendEvent; class AliVEventHandler : public TNamed { @@ -64,10 +64,10 @@ enum EEventHandlerFlags { virtual TList *GetUserInfo() const {return 0x0;}; // HLT - virtual Bool_t InitTaskInputData(AliVVevent* /*event*/, AliVVfriendEvent* /*esdFriend*/, TObjArray* /*arrTasks*/) {return kTRUE;}; + virtual Bool_t InitTaskInputData(AliVVevent* /*event*/, AliVfriendEvent* /*esdFriend*/, TObjArray* /*arrTasks*/) {return kTRUE;}; virtual AliVEvent* GetEvent() const {return 0x0;}; virtual AliVVevent* GetVVEvent() const {return 0x0;}; - virtual AliVVfriendEvent* GetVVFriendEvent() const {return 0x0;}; + virtual AliVfriendEvent* GetVFriendEvent() const {return 0x0;}; private : ClassDef(AliVEventHandler, 1); diff --git a/STEER/STEERBase/AliVVMisc.h b/STEER/STEERBase/AliVMisc.h similarity index 52% rename from STEER/STEERBase/AliVVMisc.h rename to STEER/STEERBase/AliVMisc.h index 9c1ade9ea06..aa8e12c0d23 100644 --- a/STEER/STEERBase/AliVVMisc.h +++ b/STEER/STEERBase/AliVMisc.h @@ -1,5 +1,5 @@ -#ifndef ALIVVMISC_H -#define ALIVVMISC_H +#ifndef ALIVMISC_H +#define ALIVMISC_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice * @@ -7,9 +7,9 @@ -enum AliVVConstructorReinitialisationFlag{AliVVReinitialize}; +enum AliVConstructorReinitialisationFlag{AliVReinitialize}; -typedef enum AliVVConstructorReinitialisationFlag AliVVConstructorReinitialisationFlag; +typedef enum AliVConstructorReinitialisationFlag AliVConstructorReinitialisationFlag; #endif diff --git a/STEER/STEERBase/AliVParticle.h b/STEER/STEERBase/AliVParticle.h index 65f8044baa1..19ba86cca80 100644 --- a/STEER/STEERBase/AliVParticle.h +++ b/STEER/STEERBase/AliVParticle.h @@ -12,7 +12,7 @@ #include #include -#include "AliVVMisc.h" +#include "AliVMisc.h" #include @@ -31,7 +31,7 @@ public: AliVParticle& operator=(const AliVParticle& vPart); // constructor for reinitialisation of vtable - AliVParticle( AliVVConstructorReinitialisationFlag ) :TObject(*this){} + AliVParticle( AliVConstructorReinitialisationFlag ) :TObject(){} // kinematics virtual Double_t Px() const = 0; diff --git a/STEER/STEERBase/AliVVTPCseed.h b/STEER/STEERBase/AliVTPCseed.h similarity index 68% rename from STEER/STEERBase/AliVVTPCseed.h rename to STEER/STEERBase/AliVTPCseed.h index ee2a340a22e..1dc4999058a 100644 --- a/STEER/STEERBase/AliVVTPCseed.h +++ b/STEER/STEERBase/AliVTPCseed.h @@ -1,5 +1,5 @@ -#ifndef ALIVVTPCSEED_H -#define ALIVVTPCSEED_H +#ifndef ALIVTPCSEED_H +#define ALIVTPCSEED_H /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice * @@ -8,12 +8,11 @@ #include "Rtypes.h" class AliTPCseed; -class AliVVTPCseed { +class AliVTPCseed { public: - AliVVTPCseed() {} - virtual ~AliVVTPCseed() {} + AliVTPCseed() {} + virtual ~AliVTPCseed() {} virtual void CopyToTPCseed( AliTPCseed &) const = 0; - //ClassDef(AliVVTPCseed, 0); }; #endif diff --git a/STEER/STEERBase/AliVTrack.h b/STEER/STEERBase/AliVTrack.h index bb79f465f3e..fcc7f50fc87 100644 --- a/STEER/STEERBase/AliVTrack.h +++ b/STEER/STEERBase/AliVTrack.h @@ -13,7 +13,7 @@ #include "AliVParticle.h" #include "AliPID.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" class AliVEvent; class AliVVertex; @@ -71,7 +71,7 @@ public: AliVTrack(const AliVTrack& vTrack); AliVTrack& operator=(const AliVTrack& vTrack); // constructor for reinitialisation of vtable - AliVTrack( AliVVConstructorReinitialisationFlag f) :AliVParticle(f){} + AliVTrack( AliVConstructorReinitialisationFlag f) :AliVParticle(f){} virtual const AliVEvent* GetEvent() const {return 0;} virtual Int_t GetID() const = 0; diff --git a/STEER/STEERBase/AliVVTPCseed.cxx b/STEER/STEERBase/AliVVTPCseed.cxx deleted file mode 100644 index 88804e3dcc8..00000000000 --- a/STEER/STEERBase/AliVVTPCseed.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "AliVVTPCseed.h" diff --git a/STEER/STEERBase/AliVVTRDseed.cxx b/STEER/STEERBase/AliVVTRDseed.cxx deleted file mode 100644 index 16ad7e35c0c..00000000000 --- a/STEER/STEERBase/AliVVTRDseed.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "AliVVTRDseed.h" diff --git a/STEER/STEERBase/AliVVTRDseed.h b/STEER/STEERBase/AliVVTRDseed.h deleted file mode 100644 index a835fba02cd..00000000000 --- a/STEER/STEERBase/AliVVTRDseed.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef ALIVVTRDSEED_H -#define ALIVVTRDSEED_H - -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice * - * Primary Author: Mikolaj Krzewicki, mkrzewic@cern.ch - */ - -class AliVVTRDseed { - public: - AliVVTRDseed(); - virtual ~AliVVTRDseed(); - //ClassDef(AliVVTRDseed, 0); -}; - -#endif diff --git a/STEER/STEERBase/AliVVcluster.cxx b/STEER/STEERBase/AliVVcluster.cxx deleted file mode 100644 index 3f1f9ffee84..00000000000 --- a/STEER/STEERBase/AliVVcluster.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "AliVVcluster.h" diff --git a/STEER/STEERBase/AliVVcluster.h b/STEER/STEERBase/AliVVcluster.h deleted file mode 100644 index a4a0a256408..00000000000 --- a/STEER/STEERBase/AliVVcluster.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef ALIVVCLUSTER_H -#define ALIVVCLUSTER_H - -#include "Rtypes.h" - -class AliVVcluster -{ - public: - AliVVcluster() {} - AliVVcluster(Bool_t) {} - virtual ~AliVVcluster() {} - virtual void SetX(Float_t /*x*/) {} - virtual void SetY(Float_t /*y*/) {} - virtual void SetZ(Float_t /*z*/) {} - virtual void SetPadRow(Short_t /*padrow*/) {} - virtual void SetSigmaY2(Float_t /*sigmaY2*/) {} - virtual void SetSigmaZ2(Float_t /*sigmaZ2*/) {} - virtual void SetCharge(UShort_t /*charge*/) {} - virtual void SetQMax(UShort_t /*qmax*/) {} - - virtual Float_t GetX() const {return 0.;} - virtual Float_t GetY() const {return 0.;} - virtual Float_t GetZ() const {return 0.;} - virtual UShort_t GetPadRow() const {return 0;} - virtual Float_t GetSigmaY2() const {return 0.;} - virtual Float_t GetSigmaZ2() const {return 0.;} - virtual UShort_t GetCharge() const {return 0;} - virtual UShort_t GetQMax() const {return 0;} -}; -#endif diff --git a/STEER/STEERBase/AliVVevent.h b/STEER/STEERBase/AliVVevent.h index 54038a4f680..b05edcdb314 100644 --- a/STEER/STEERBase/AliVVevent.h +++ b/STEER/STEERBase/AliVVevent.h @@ -10,13 +10,13 @@ */ #include "Rtypes.h" #include "TString.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" class TList; //class AliVVvertex; class AliVVtrack; class AliMultiplicity; -class AliVVfriendEvent; +class AliVfriendEvent; class AliESDkink; class TTree; @@ -29,7 +29,7 @@ class AliVVevent{ AliVVevent() {} // constructor and method for reinitialisation of virtual table - AliVVevent( AliVVConstructorReinitialisationFlag ){} + AliVVevent( AliVConstructorReinitialisationFlag ){} protected: @@ -79,7 +79,7 @@ class AliVVevent{ virtual AliESDkink* GetKink(Int_t /*i*/) const = 0; //virtual AliVVtrack* GetV0(Int_t /*i*/) const = 0; - virtual AliVVfriendEvent* FindFriend() const = 0; + virtual AliVfriendEvent* FindFriend() const = 0; // some ESD interfaces, not yet implemented in flat esd (may be not needed, may be need some changes) diff --git a/STEER/STEERBase/AliVVfriendEvent.cxx b/STEER/STEERBase/AliVVfriendEvent.cxx deleted file mode 100644 index f322c5a8a7b..00000000000 --- a/STEER/STEERBase/AliVVfriendEvent.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "AliVVfriendEvent.h" diff --git a/STEER/STEERBase/AliVVfriendTrack.cxx b/STEER/STEERBase/AliVVfriendTrack.cxx deleted file mode 100644 index 0fd25531e1b..00000000000 --- a/STEER/STEERBase/AliVVfriendTrack.cxx +++ /dev/null @@ -1 +0,0 @@ -#include "AliVVfriendTrack.h" diff --git a/STEER/STEERBase/AliVVfriendTrack.h b/STEER/STEERBase/AliVVfriendTrack.h deleted file mode 100644 index 10a736f2dbb..00000000000 --- a/STEER/STEERBase/AliVVfriendTrack.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef ALIVVFRIENDTRACK_H -#define ALIVVFRIENDTRACK_H - -//_____________________________________________________________________________ -#include "AliVVMisc.h" - -#include "Rtypes.h" -class AliTPCseed; -class AliVVtrackPointArray; - -//_____________________________________________________________________________ -class AliVVfriendTrack { -public: - - AliVVfriendTrack(){} - // constructor for reinitialisation of vtable - AliVVfriendTrack( AliVVConstructorReinitialisationFlag ){} - - virtual ~AliVVfriendTrack(){} - - //used in calibration - - virtual Int_t GetTPCseed( AliTPCseed &) const = 0; - //virtual const AliVVtrackPointArray *GetTrackPointArray() const {return NULL;} - //virtual const AliVVtrack * GetITSOut() const {return NULL;} - //virtual const AliVVtrack * GetTPCOut() const {return NULL;} - //virtual const AliVVtrack * GetTRDIn() const {return NULL;} - // virtual TObject* GetCalibObject(Int_t /*index*/) const = 0; - -private: - AliVVfriendTrack(const AliVVfriendTrack &); - AliVVfriendTrack& operator=(const AliVVfriendTrack& esd); - - //ClassDef(AliVVfriendTrack,0); -}; - -#endif - - diff --git a/STEER/STEERBase/AliVVkink.cxx b/STEER/STEERBase/AliVVkink.cxx deleted file mode 100644 index 025183ad8cb..00000000000 --- a/STEER/STEERBase/AliVVkink.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 "AliVVkink.h" - - diff --git a/STEER/STEERBase/AliVVkink.h b/STEER/STEERBase/AliVVkink.h deleted file mode 100644 index a85ff05abc7..00000000000 --- a/STEER/STEERBase/AliVVkink.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef ALIVVkink_H -#define ALIVVkink_H - -/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * See cxx source for full Copyright notice * - * Primary Authors : Sergey Gorbunov, Jochen Thaeder, Chiara Zampolli */ - -/** - * >> interface class << - */ - -class AliVVkink -{ - public: - virtual ~AliVVkink() {} - - // ClassDef(AliVVkink, 0) // base class for kink data - -}; - -#endif diff --git a/STEER/STEERBase/AliVVtrack.h b/STEER/STEERBase/AliVVtrack.h index c04ab6c1d72..36efe69b706 100644 --- a/STEER/STEERBase/AliVVtrack.h +++ b/STEER/STEERBase/AliVVtrack.h @@ -10,7 +10,7 @@ */ #include "Rtypes.h" -#include "AliVVMisc.h" +#include "AliVMisc.h" class AliExternalTrackParam; class AliVVtrack { @@ -21,8 +21,8 @@ class AliVVtrack { virtual ~AliVVtrack() {} // constructor and method for reinitialisation of virtual table - AliVVtrack( AliVVConstructorReinitialisationFlag ) {} - void Reinitialize() { new (this) AliVVtrack( AliVVReinitialize ); } + AliVVtrack( AliVConstructorReinitialisationFlag ) {} + void Reinitialize() { new (this) AliVVtrack( AliVReinitialize ); } // -------------------------------------------------------------------------------- diff --git a/STEER/STEERBase/AliVVtrackPoint.cxx b/STEER/STEERBase/AliVVtrackPoint.cxx deleted file mode 100644 index c02bb35ef63..00000000000 --- a/STEER/STEERBase/AliVVtrackPoint.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "AliVVtrackPoint.h" - diff --git a/STEER/STEERBase/AliVVtrackPoint.h b/STEER/STEERBase/AliVVtrackPoint.h deleted file mode 100644 index e09abbe6d53..00000000000 --- a/STEER/STEERBase/AliVVtrackPoint.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef ALIVVTRACKPOINT_H -#define ALIVVTRACKPOINT_H - -#include "Rtypes.h" -class TGeoRotation; -class AliTrackPoint; - - -class AliVVtrackPoint { - public: - AliVVtrackPoint() {} - virtual ~AliVVtrackPoint() {} - - - virtual void SetXYZ(Float_t /*x*/, Float_t /*y*/, Float_t /*z*/, const Float_t *cov = 0) {if (cov) return;} - virtual void SetXYZ(const Float_t* /*xyz*/, const Float_t *cov = 0) {if (cov) return;} - virtual void SetCov(const Float_t* /*cov*/) {} - virtual void SetVolumeID(UShort_t /*volid*/) {} - virtual void SetCharge(Float_t /*charge*/) {} - virtual void SetDriftTime(Float_t /*time*/) {} - virtual void SetChargeRatio(Float_t /*ratio*/) {} - virtual void SetClusterType(Int_t /*clutype*/) {} - virtual void SetExtra(Bool_t flag=kTRUE) {if (flag) return;} - - virtual Float_t GetX() const { return 0.; } - virtual Float_t GetY() const { return 0.; } - virtual Float_t GetZ() const { return 0.; } - virtual void GetXYZ(Float_t* /*xyz*/, Float_t* cov = 0) const {if (cov) return;} - virtual const Float_t* GetCov() const { return NULL; } - virtual UShort_t GetVolumeID() const { return 0; } - virtual Float_t GetCharge() const { return 0.; } - virtual Float_t GetDriftTime() const { return 0.;} - virtual Float_t GetChargeRatio() const { return 0.;} - virtual Int_t GetClusterType() const { return 0;} - virtual Bool_t IsExtra() const { return kFALSE;} - - virtual Float_t GetResidual(const AliVVtrackPoint& /*p*/, Bool_t weighted = kFALSE) const {if (weighted) return 0.; else return 0.;} - virtual Bool_t GetPCA(const AliVVtrackPoint& /*p*/, AliVVtrackPoint& /*out*/) const {return kFALSE;} - - virtual Float_t GetAngle() const {return 0.;} - virtual Bool_t GetRotMatrix(TGeoRotation& /*rot*/) const {return kFALSE;} - //virtual void SetAlignCovMatrix(const TMatrixDSym& /*alignparmtrx*/) {} - - //virtual AliTrackPoint& Rotate(Float_t /*alpha*/) const {return *this;} - //virtual AliTrackPoint& MasterToLocal() const {return *this;} - - virtual void Print(Option_t*) const {} - - //ClassDef(AliVVtrackPoint, 0); -}; - -#endif diff --git a/STEER/STEERBase/AliVVtrackPointArray.cxx b/STEER/STEERBase/AliVVtrackPointArray.cxx deleted file mode 100644 index eee81020122..00000000000 --- a/STEER/STEERBase/AliVVtrackPointArray.cxx +++ /dev/null @@ -1,2 +0,0 @@ -#include "AliVVtrackPointArray.h" - diff --git a/STEER/STEERBase/AliVVtrackPointArray.h b/STEER/STEERBase/AliVVtrackPointArray.h deleted file mode 100644 index 9cb8c3a39ee..00000000000 --- a/STEER/STEERBase/AliVVtrackPointArray.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef ALIVVTRACKPOINTARRAY_H -#define ALIVVTRACKPOINTARRAY_H - -#include "Rtypes.h" - -#include "AliVVtrackPoint.h" - -class AliVVtrackPointArray { - public: - AliVVtrackPointArray() {} - virtual ~AliVVtrackPointArray() {} - virtual Int_t GetNPoints() const {return 0;} - virtual Bool_t GetPoint(AliVVtrackPoint& /*p*/, Int_t /*i*/) const =0 ; - - //ClassDef(AliVVtrackPointArray, 0); -}; - -#endif diff --git a/STEER/STEERBase/AliVVfriendEvent.h b/STEER/STEERBase/AliVfriendEvent.h similarity index 50% rename from STEER/STEERBase/AliVVfriendEvent.h rename to STEER/STEERBase/AliVfriendEvent.h index 6902bd0b800..32ec30a10e0 100644 --- a/STEER/STEERBase/AliVVfriendEvent.h +++ b/STEER/STEERBase/AliVfriendEvent.h @@ -1,14 +1,14 @@ -#ifndef ALIVVFRIENDEVENT_H -#define ALIVVFRIENDEVENT_H +#ifndef ALIVFRIENDEVENT_H +#define ALIVFRIENDEVENT_H #include "Rtypes.h" -class AliVVfriendTrack; +class AliVfriendTrack; //_____________________________________________________________________________ -class AliVVfriendEvent { +class AliVfriendEvent { public: - AliVVfriendEvent() {} - virtual ~AliVVfriendEvent() {} + AliVfriendEvent() {} + virtual ~AliVfriendEvent() {} virtual Int_t GetNclustersTPC(UInt_t /*sector*/) const = 0; virtual Int_t GetNclustersTPCused(UInt_t /*sector*/) const = 0; @@ -16,13 +16,13 @@ public: //used in calibration virtual Bool_t TestSkipBit() const = 0; virtual Int_t GetNumberOfTracks() const = 0; - virtual const AliVVfriendTrack *GetTrack(Int_t /*i*/) const = 0; + virtual const AliVfriendTrack *GetTrack(Int_t /*i*/) const = 0; private: - AliVVfriendEvent(const AliVVfriendEvent &); - AliVVfriendEvent& operator=(const AliVVfriendEvent& esd); + AliVfriendEvent(const AliVfriendEvent &); + AliVfriendEvent& operator=(const AliVfriendEvent& esd); -// ClassDef(AliVVfriendEvent,0); +// ClassDef(AliVfriendEvent,0); }; #endif diff --git a/STEER/STEERBase/AliVfriendTrack.h b/STEER/STEERBase/AliVfriendTrack.h new file mode 100644 index 00000000000..7ce8020b9db --- /dev/null +++ b/STEER/STEERBase/AliVfriendTrack.h @@ -0,0 +1,39 @@ +#ifndef ALIVFRIENDTRACK_H +#define ALIVFRIENDTRACK_H + +//_____________________________________________________________________________ +#include "AliVMisc.h" + +#include "Rtypes.h" +class AliTPCseed; +class AliVVtrackPointArray; + +//_____________________________________________________________________________ +class AliVfriendTrack { +public: + + AliVfriendTrack(){} + // constructor for reinitialisation of vtable + AliVfriendTrack( AliVConstructorReinitialisationFlag ){} + + virtual ~AliVfriendTrack(){} + + //used in calibration + + virtual Int_t GetTPCseed( AliTPCseed &) const = 0; + //virtual const AliVtrackPointArray *GetTrackPointArray() const {return NULL;} + //virtual const AliVtrack * GetITSOut() const {return NULL;} + //virtual const AliVtrack * GetTPCOut() const {return NULL;} + //virtual const AliVtrack * GetTRDIn() const {return NULL;} + // virtual TObject* GetCalibObject(Int_t /*index*/) const = 0; + +private: + AliVfriendTrack(const AliVfriendTrack &); + AliVfriendTrack& operator=(const AliVfriendTrack& esd); + + //ClassDef(AliVfriendTrack,0); +}; + +#endif + + diff --git a/STEER/STEERBaseLinkDef.h b/STEER/STEERBaseLinkDef.h index 3200819016d..74f6a5626f1 100644 --- a/STEER/STEERBaseLinkDef.h +++ b/STEER/STEERBaseLinkDef.h @@ -140,13 +140,6 @@ #pragma link C++ class AliVVevent+; #pragma link C++ class AliVVtrack+; -#pragma link C++ class AliVVfriendEvent+; -#pragma link C++ class AliVVfriendTrack+; -#pragma link C++ class AliVVkink+; -#pragma link C++ class AliVVcluster+; -#pragma link C++ class AliVVtrackPointArray+; -#pragma link C++ class AliVVtrackPoint+; -#pragma link C++ class AliVVTPCseed+; #endif diff --git a/TPC/Calib/AliAnalysisTaskPt.cxx b/TPC/Calib/AliAnalysisTaskPt.cxx index 896e91e1e18..e742d2c61be 100644 --- a/TPC/Calib/AliAnalysisTaskPt.cxx +++ b/TPC/Calib/AliAnalysisTaskPt.cxx @@ -14,8 +14,8 @@ #include "AliVEventHandler.h" #include "AliTPCseed.h" #include "AliTPCclusterMI.h" -#include "AliVVfriendEvent.h" -#include "AliVVfriendTrack.h" +#include "AliVfriendEvent.h" +#include "AliVfriendTrack.h" #include "AliAnalysisTaskPt.h" @@ -65,7 +65,7 @@ void AliAnalysisTaskPt::ConnectInputData(Option_t *) //fESD = dynamic_cast(esdH->GetEvent()); fESD = esdH->GetVVEvent(); if (fUseFriends){ - fESDfriend = esdH->GetVVFriendEvent(); + fESDfriend = esdH->GetVFriendEvent(); } } if (!fESD) { @@ -170,7 +170,7 @@ void AliAnalysisTaskPt::Exec(Option_t *) // Friend Track loop for (Int_t iFriend = 0; iFriend < nESDfriendtracks; iFriend++) { //Printf("Getting friend %d", iFriend); - const AliVVfriendTrack* friendTrack = fESDfriend->GetTrack(iFriend); + const AliVfriendTrack* friendTrack = fESDfriend->GetTrack(iFriend); if (!friendTrack) { Printf("ERROR: Could not receive track %d", iFriend); continue; diff --git a/TPC/Calib/AliAnalysisTaskPt.h b/TPC/Calib/AliAnalysisTaskPt.h index 326cf54958f..d05fe9fa9cc 100644 --- a/TPC/Calib/AliAnalysisTaskPt.h +++ b/TPC/Calib/AliAnalysisTaskPt.h @@ -6,7 +6,7 @@ class TH1F; class AliESDEvent; -class AliVVfriendEvent; +class AliVfriendEvent; class AliVVevent; class AliESDtrackCuts; class TList; @@ -30,7 +30,7 @@ class AliAnalysisTaskPt : public AliAnalysisTask { private: AliVVevent* fESD; // ESD object - AliVVfriendEvent* fESDfriend; // ESD friend object + AliVfriendEvent* fESDfriend; // ESD friend object TH1F* fHistPt; // Pt spectrum AliESDtrackCuts* fCuts; // cuts Int_t fEv; diff --git a/TPC/Rec/AliTPCseed.h b/TPC/Rec/AliTPCseed.h index ef55a6637ef..4fabb13a93c 100644 --- a/TPC/Rec/AliTPCseed.h +++ b/TPC/Rec/AliTPCseed.h @@ -20,7 +20,7 @@ #include "AliTPCtrack.h" #include "AliComplexCluster.h" #include "AliPID.h" -#include "AliVVTPCseed.h" +#include "AliVTPCseed.h" class TFile; class AliTPCParam; @@ -31,7 +31,7 @@ class AliESD; class AliTPCCalPad; class TClonesArray; -class AliTPCseed : public AliTPCtrack, public AliVVTPCseed { +class AliTPCseed : public AliTPCtrack, public AliVTPCseed { public: AliTPCseed(); virtual ~AliTPCseed(); -- 2.43.5