X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSVertexerZTest.C;h=0f96dd052653537b294f7f787c235e1bfa354329;hb=b8cc7183f9d746941259748974da14d043b60454;hp=cbf1493fa81e45a44d92886cb0a205ba8235a148;hpb=0ec9cdc27a9bf982f1cac09282fa04ee9463d9f5;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSVertexerZTest.C b/ITS/AliITSVertexerZTest.C
index cbf1493fa81..0f96dd05265 100644
--- a/ITS/AliITSVertexerZTest.C
+++ b/ITS/AliITSVertexerZTest.C
@@ -8,6 +8,7 @@
 #include <AliRun.h>
 #include <AliHeader.h>
 #include <AliGenEventHeader.h>
+#include <AliGeomManager.h>
 #include <AliITSVertexerZ.h>
 #include <AliRunLoader.h>
 #include <AliITSLoader.h>
@@ -38,23 +39,19 @@ void AliITSVertexerZTest(Float_t delphi=0.05,Float_t window=3.,Float_t initx=0.,
     cerr<<"AliITSVertexerZTest.C : LoadKinematics returned error"<<endl;
     return;
   }
-  TGeoManager::Import("geometry.root");
-  AliITSLoader* ITSloader =  (AliITSLoader*) rl->GetLoader("ITSLoader");
+  
+  AliGeomManager::LoadGeometry("geometry.root");
 
-  if(!ITSloader){
-    cerr<<"AliITSVertexerZTest.C :  ITS loader not found"<<endl;
-    return;
-  }
-  //  ITSloader->LoadRecPoints("read");
-  //  TFile *fo = new TFile("vertici.root","recreate");
-  //  AliITSVertexerPPZ *dovert = new AliITSVertexerPPZ("default",initx,inity);
-  AliITSVertexerZ *dovert = new AliITSVertexerZ("default",initx,inity);
-  dovert->SetDebug(0);
+  AliITSVertexerZ *dovert = new AliITSVertexerZ(initx,inity);
+  dovert->Init("default");
+  //dovert->SetDebug(0);
   //  dovert->SetDiffPhiMax(delphi);
   //  dovert->SetWindow(window);
   dovert->PrintStatus();
   Int_t sigmazero=0;
   AliESDVertex *vert = 0;
+  AliITSLoader* itsloader =  (AliITSLoader*) rl->GetLoader("ITSLoader");
+  itsloader->LoadRecPoints("read");
   for(Int_t i=0; i<rl->TreeE()->GetEntries(); i++){
     rl->GetEvent(i);
     // The true Z coord. is fetched for comparison
@@ -62,22 +59,23 @@ void AliITSVertexerZTest(Float_t delphi=0.05,Float_t window=3.,Float_t initx=0.,
     AliGenEventHeader* genEventHeader = header->GenEventHeader();
     TArrayF primaryVertex(3);
     genEventHeader->PrimaryVertex(primaryVertex);
-    vert = dovert->FindVertexForCurrentEvent(i);
+    TTree* cltree = itsloader->TreeR();
+    vert = dovert->FindVertexForCurrentEvent(cltree);
     if(kDebug>0){
       // Prints the results
       cout <<"========================================================\n";
       cout << "Event number: "<<i<<")  Z Vertex:"<<endl;
       if(vert){
-	cout<<"FOUND: "<<vert->GetZv()<<"; ";
+	cout<<"FOUND: "<<vert->GetZ()<<"; ";
 	cout<<vert->GetZRes()<<"; "<<vert->GetNContributors()<<endl;
 	cout <<" True Z position "<<primaryVertex[2]<<", diff= ";
-	cout<<(primaryVertex[2]-vert->GetZv())*10000.<<endl;
+	cout<<(primaryVertex[2]-vert->GetZ())*10000.<<endl;
       } else {
 	cout<<"NOT FOUND"<<endl;
       }
     }
     if(vert){
-      Float_t found = vert->GetZv();
+      Float_t found = vert->GetZ();
       diff2->Fill(primaryVertex[2],found);
       found = 10000.*(found-primaryVertex[2]);
       if(vert->GetZRes()!=0){