Fixed some missing implementations, changed test task to use VV classes. Please,...

diff --git a/ANALYSIS/AliAnalysisTaskPt.cxx b/ANALYSIS/AliAnalysisTaskPt.cxx
index 7a427451d7ad2a2da1544c416a6c291fb141297a..72fc2a332be196976f56ee190a70b6e59d4b293c 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskPt.cxx
+++ b/ANALYSIS/AliAnalysisTaskPt.cxx
@@ -8,6 +8,8 @@
 #include "AliAnalysisManager.h"
 
 #include "AliESDEvent.h"
 #include "AliAnalysisManager.h"
 
 #include "AliESDEvent.h"

+#include "AliVVevent.h"
+#include "AliVVtrack.h"

 #include "AliESDtrackCuts.h"
 #include "AliVEventHandler.h"
 
 #include "AliESDtrackCuts.h"
 #include "AliVEventHandler.h"
 


@@ -55,7 +57,8 @@ void AliAnalysisTaskPt::ConnectInputData(Option_t *)
       Printf("ERROR: Could not get ESDInputHandler");
     } else {
       Printf("----> AliAnalysisTaskPt::ConnectInputData Getting the event from handler %p", esdH);
       Printf("ERROR: Could not get ESDInputHandler");
     } else {
       Printf("----> AliAnalysisTaskPt::ConnectInputData Getting the event from handler %p", esdH);

-      fESD = dynamic_cast<AliESDEvent*>(esdH->GetEvent());
+      //fESD = dynamic_cast<AliESDEvent*>(esdH->GetEvent());
+      fESD = esdH->GetEvent();

     }
     if (!fESD) {
       Printf("ERROR, the dynamic cast did not work");
     }
     if (!fESD) {
       Printf("ERROR, the dynamic cast did not work");


@@ -97,7 +100,7 @@ void AliAnalysisTaskPt::Exec(Option_t *)
 
   // Track loop to fill a pT spectrum
   for (Int_t iTracks = 0; iTracks < fESD->GetNumberOfTracks(); iTracks++) {
 
   // Track loop to fill a pT spectrum
   for (Int_t iTracks = 0; iTracks < fESD->GetNumberOfTracks(); iTracks++) {

-    AliESDtrack* track = fESD->GetTrack(iTracks);
+    AliVVtrack* track = fESD->GetTrack(iTracks);

     if (!track) {
       Printf("ERROR: Could not receive track %d", iTracks);
       continue;
     if (!track) {
       Printf("ERROR: Could not receive track %d", iTracks);
       continue;

diff --git a/ANALYSIS/AliAnalysisTaskPt.h b/ANALYSIS/AliAnalysisTaskPt.h
index 41719558cc1466e3b19e56e969200fdb03d1d1e6..00c5a111cb620ea7300ab0d5360b547fa2d0b0e9 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskPt.h
+++ b/ANALYSIS/AliAnalysisTaskPt.h
@@ -6,6 +6,7 @@
 
 class TH1F;
 class AliESDEvent;
 
 class TH1F;
 class AliESDEvent;

+class AliVVevent;

 class AliESDtrackCuts;
 
 #include "AliAnalysisTask.h"
 class AliESDtrackCuts;
 
 #include "AliAnalysisTask.h"


@@ -22,7 +23,7 @@ class AliAnalysisTaskPt : public AliAnalysisTask {
   virtual void   Terminate(Option_t *);
 
  private:
   virtual void   Terminate(Option_t *);
 
  private:

-  AliESDEvent *fESD;    //ESD object
+  AliVVevent *fESD;    //ESD object

   TH1F        *fHistPt; //Pt spectrum
   AliESDtrackCuts* fCuts;
   Int_t fEv;
   TH1F        *fHistPt; //Pt spectrum
   AliESDtrackCuts* fCuts;
   Int_t fEv;

diff --git a/HLT/global/AliFlatESDEvent.h b/HLT/global/AliFlatESDEvent.h
index 81fdc39f8fa284c8151e4d1ce4b27a32d6788c6e..2e46f9811507ac64f0d723da3cd7bc2e30e99171 100644 (file)
--- a/HLT/global/AliFlatESDEvent.h
+++ b/HLT/global/AliFlatESDEvent.h
@@ -66,7 +66,7 @@ class AliFlatESDEvent: public AliVVevent {
     return (fPrimaryVertexMask & 0x2) ? reinterpret_cast<const AliFlatESDVertex*>(fContent + CountBits(fPrimaryVertexMask, 0x1)) : NULL;
   } 
 
     return (fPrimaryVertexMask & 0x2) ? reinterpret_cast<const AliFlatESDVertex*>(fContent + CountBits(fPrimaryVertexMask, 0x1)) : NULL;
   } 
 

-  Int_t GetNumberOfV0s() {return fNV0s;}
+  Int_t GetNumberOfV0s() const {return fNV0s;}

 
   Int_t GetNumberOfTracks() const {return fNTracks;}
   
 
   Int_t GetNumberOfTracks() const {return fNTracks;}
   


@@ -74,7 +74,7 @@ class AliFlatESDEvent: public AliVVevent {
 
   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*/) {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;}
   Int_t GetNumberOfKinks() const {return 0;}
   AliVVkink* GetKink(Int_t /*i*/) const {return NULL;}
   AliFlatESDV0* GetV0(Int_t /*i*/) const {return NULL;}
   Int_t GetNumberOfKinks() const {return 0;}

diff --git a/STEER/ESD/AliESDkink.h b/STEER/ESD/AliESDkink.h
index cb1849c63253da216231ec924d3ba2feaa6984de..7435da669835e01f3597dce17ef4d744905eacd7 100644 (file)
--- a/STEER/ESD/AliESDkink.h
+++ b/STEER/ESD/AliESDkink.h
@@ -88,7 +88,7 @@ public:
   Char_t           fStatus[12];       //status of kink - first 4 mother (ITS,TPC,TRD,TOF)  other daughter
 
 
   Char_t           fStatus[12];       //status of kink - first 4 mother (ITS,TPC,TRD,TOF)  other daughter
 
 

-  ClassDef(AliESDkink,4)      // ESD V0 vertex
+  ClassDef(AliESDkink, 5)      // ESD V0 vertex

 };
 
 #endif
 };
 
 #endif

diff --git a/STEER/STEERBase/AliVEvent.h b/STEER/STEERBase/AliVEvent.h
index fa94ae81bc80c353163e0995feed4f862e695cd1..be2b5fc97f42c2404687245398a1122dfdd7126f 100644 (file)
--- a/STEER/STEERBase/AliVEvent.h
+++ b/STEER/STEERBase/AliVEvent.h
@@ -202,7 +202,7 @@ public:
 
   virtual void ConnectTracks() {}
 
 
   virtual void ConnectTracks() {}
 

-  ClassDef(AliVEvent,2)  // base class for AliEvent data
+  ClassDef(AliVEvent, 3)  // base class for AliEvent data

 };
 #endif 
 
 };
 #endif 
 

diff --git a/STEER/STEERBase/AliVParticle.h b/STEER/STEERBase/AliVParticle.h
index 7233ea4ba34b04a8d2c1bf2e9b42f4f7023b9071..0c630c2029b200968e5c51078c380660f9b89a16 100644 (file)
--- a/STEER/STEERBase/AliVParticle.h
+++ b/STEER/STEERBase/AliVParticle.h
@@ -85,7 +85,7 @@ public:
 
   
 
 
   
 

-  ClassDef(AliVParticle, 3)  // base class for particles
+  ClassDef(AliVParticle, 4)  // base class for particles

 };
 
 #endif
 };
 
 #endif

diff --git a/STEER/STEERBase/AliVVertex.h b/STEER/STEERBase/AliVVertex.h
index 36fc26f267e618010ede0b532c57b16fe342f4b6..02bdb22b622ee2500a57867715c55cc028ab19b0 100644 (file)
--- a/STEER/STEERBase/AliVVertex.h
+++ b/STEER/STEERBase/AliVVertex.h
@@ -41,7 +41,7 @@ public:
   virtual void Clear(Option_t* option) {TNamed::Clear(option);}
 
 
   virtual void Clear(Option_t* option) {TNamed::Clear(option);}
 
 

-  ClassDef(AliVVertex,1)  // base class for vertices
+  ClassDef(AliVVertex,2)  // base class for vertices

 };
 
 #endif
 };
 
 #endif

diff --git a/STEER/STEERBase/AliVVevent.h b/STEER/STEERBase/AliVVevent.h
index 21fb3cbf8fb353865bfd7ddb0a455dce179c1a8e..9a1fcfa838ac6873d6ec528df3b0e5448e9697d9 100644 (file)
--- a/STEER/STEERBase/AliVVevent.h
+++ b/STEER/STEERBase/AliVVevent.h
@@ -22,10 +22,10 @@ class AliVVevent {
   // --------------------------------------------------------------------------------
   // -- Constructor / Destructors
   AliVVevent() {}
   // --------------------------------------------------------------------------------
   // -- Constructor / Destructors
   AliVVevent() {}

-  virtual ~AliVVevent() {}
+  virtual ~AliVVevent() {} 

 
   // --------------------------------------------------------------------------------
 
   // --------------------------------------------------------------------------------

-  virtual void Reset();
+  virtual void Reset() = 0;

 
   // --------------------------------------------------------------------------------
   // Access methods
 
   // --------------------------------------------------------------------------------
   // Access methods


@@ -50,5 +50,8 @@ class AliVVevent {
   virtual UInt_t GetTimeStamp() const { return 0;}
   virtual UInt_t GetEventSpecie() const { return 0;}
   //virtual AliVVeventFriend* FindFriend() const { return NULL; }
   virtual UInt_t GetTimeStamp() const { return 0;}
   virtual UInt_t GetEventSpecie() const { return 0;}
   //virtual AliVVeventFriend* FindFriend() const { return NULL; }

+
+  //  ClassDef(AliVVevent,1)  // base class for AliEvent data
+

 };
 #endif
 };
 #endif

diff --git a/STEER/STEERBase/AliVVtrack.h b/STEER/STEERBase/AliVVtrack.h
index af7d6b08ccc9d70bb3955ddfe875b49b7198bd7e..9ae853507cf3af7ab0b9ef922919a0316484f9c6 100644 (file)
--- a/STEER/STEERBase/AliVVtrack.h
+++ b/STEER/STEERBase/AliVVtrack.h
@@ -84,5 +84,8 @@ class AliVVtrack {
   //AliTPCtrack
   virtual void GetNFoundable(Int_t /*n*/) {} 
   virtual Double_t GetdEdx()  const {return 0.;}
   //AliTPCtrack
   virtual void GetNFoundable(Int_t /*n*/) {} 
   virtual Double_t GetdEdx()  const {return 0.;}

+
+  //  ClassDef(AliVVtrack, 1)   
+

 };
 #endif
 };
 #endif

diff --git a/STEER/STEERBase/AliVVvertex.h b/STEER/STEERBase/AliVVvertex.h
index 140ca467d2652f1d80775a876d7bab700d822875..4a5f214bb5a7d73c1bafad1515182ec0174d0b58 100644 (file)
--- a/STEER/STEERBase/AliVVvertex.h
+++ b/STEER/STEERBase/AliVVvertex.h
@@ -13,6 +13,8 @@
 class AliVVvertex
 {
   public:
 class AliVVvertex
 {
   public:

+  AliVVvertex() {} 
+  virtual ~AliVVvertex() {}

   virtual Double_t GetX() const { return 0; }
   virtual Double_t GetY() const { return 0; }
   virtual Double_t GetZ() const { return 0; }
   virtual Double_t GetX() const { return 0; }
   virtual Double_t GetY() const { return 0; }
   virtual Double_t GetZ() const { return 0; }


@@ -23,9 +25,12 @@ class AliVVvertex
   virtual Int_t    GetNDF() const = 0;
   virtual void     PrintIndices() const = 0;
   virtual void     Print(Option_t* option = "") const = 0;
   virtual Int_t    GetNDF() const = 0;
   virtual void     PrintIndices() const = 0;
   virtual void     Print(Option_t* option = "") const = 0;

-  virtual Int_t    GetBC() const;
-  virtual void Clear(Option_t* /*option*/) {}
+  virtual Int_t    GetBC() const = 0;
+  virtual void Clear(Option_t* /*option*/) = 0;

   virtual Int_t    GetNContributors() const { return 0; }
   virtual Int_t    GetNContributors() const { return 0; }

+
+  //  ClassDef(AliVVvertex, 1)   
+

 };
 
 #endif
 };
 
 #endif