Two bug fixes in the mean vertexer. Getters for the xy and z histos. Some wrong inclu...

diff --git a/ITS/AliITSMeanVertexer.cxx b/ITS/AliITSMeanVertexer.cxx
index 95e5ada..a7fe298 100644 (file)
--- a/ITS/AliITSMeanVertexer.cxx
+++ b/ITS/AliITSMeanVertexer.cxx
@@ -81,7 +81,7 @@ Bool_t AliITSMeanVertexer::Init() {
   if (!geom) return kFALSE;
   printf("Geometry name: %s \n",(initgeom.GetGeometryName()).Data());
 
-  AliITSDetTypeRec *fDetTypeRec = new AliITSDetTypeRec();
+  fDetTypeRec = new AliITSDetTypeRec();
   fDetTypeRec->SetITSgeom(geom);
   fDetTypeRec->SetDefaults();
   fDetTypeRec->SetDefaultClusterFindersV2(kTRUE);
@@ -123,7 +123,7 @@ Bool_t AliITSMeanVertexer::Reconstruct(AliRawReader *rawReader, Bool_t mode){
   else {
   // Run standard vertexer3d
     AliITSVertexer3D *vertexer2 = new AliITSVertexer3D();
-    AliESDVertex *vtx = vertexer2->FindVertexForCurrentEvent(clustersTree);
+    vtx = vertexer2->FindVertexForCurrentEvent(clustersTree);
     AliMultiplicity *mult = vertexer2->GetMultiplicity();
     delete vertexer2;
     if(Filter(vtx,mult)) vtxOK = kTRUE;

diff --git a/ITS/AliITSMeanVertexer.h b/ITS/AliITSMeanVertexer.h
index b9a9e76..bef3df8 100644 (file)
--- a/ITS/AliITSMeanVertexer.h
+++ b/ITS/AliITSMeanVertexer.h
@@ -1,8 +1,6 @@
 #ifndef ALIITSMEANVERTEXER_H
 #define ALIITSMEANVERTEXER_H
 
-#include <TString.h>
-
 ///////////////////////////////////////////////////////////////////////
 //                                                                   //
 // Class to compute vertex position using SPD local reconstruction   //
@@ -12,12 +10,14 @@
 
 /* $Id$ */
 
-class TObject;
+#include <TObject.h>
+
 class TH1F;
 class TH2F;
 class AliRawReader;
 class AliMultiplicity;
 class AliESDVertex;
+class AliITSDetTypeRec;
 
 class AliITSMeanVertexer : public TObject {
 
@@ -33,6 +33,8 @@ class AliITSMeanVertexer : public TObject {
     Bool_t Reconstruct(AliRawReader *rawReader, Bool_t mode = kTRUE);
     void   WriteVertices(const char *filename);
 
+    const TH2F*GetVertexXY() const { return fVertexXY; }
+    const TH1F*GetVertexZ()  const { return fVertexZ;  }
  
  private:
     // copy constructor (NO copy allowed)
@@ -59,7 +61,7 @@ class AliITSMeanVertexer : public TObject {
     Int_t fFilterOnContributors; //! Numb. of contrib must be > fFilter...
     Int_t fFilterOnTracklets; //! Numb. of tracklets must be > fFilterOnTr...
 
-  ClassDef(AliITSMeanVertexer,0);
+    ClassDef(AliITSMeanVertexer,0)
 };
 
 #endif

diff --git a/ITS/ITSSPDVertexDiamondda.cxx b/ITS/ITSSPDVertexDiamondda.cxx
index 4964252..68678b8 100644 (file)
--- a/ITS/ITSSPDVertexDiamondda.cxx
+++ b/ITS/ITSSPDVertexDiamondda.cxx
@@ -27,9 +27,12 @@ extern "C" {
 
 #include <TPluginManager.h>
 #include <TROOT.h>
+#include <TH1.h>
+#include <TH2.h>
 
 #include "AliRawReaderDate.h"
 #include "AliCDBManager.h"
+#include "AliITSMeanVertexer.h"
 
 int main(int argc, char **argv) {
 
@@ -161,8 +164,8 @@ int main(int argc, char **argv) {
 
 #ifdef ALI_AMORE
   // send the histos to AMORE pool
-  printf("AMORE send status: %d",vtxAmore.Send(mv->GetVertexXY()->GetName(),mv->GetVertexXY()));
-  printf("AMORE send status: %d",vtxAmore.Send(mv->GetVertexZ()->GetName(),mv->GetVertexZ()));
+  printf("AMORE send status: %d\n",vtxAmore.Send(mv->GetVertexXY()->GetName(),mv->GetVertexXY()));
+  printf("AMORE send status: %d\n",vtxAmore.Send(mv->GetVertexZ()->GetName(),mv->GetVertexZ()));
 #endif
 
   delete mv;