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

diff --git a/ITS/AliITSVertexerZTest.C b/ITS/AliITSVertexerZTest.C
index 21d91a96a05..0f96dd05265 100644
--- a/ITS/AliITSVertexerZTest.C
+++ b/ITS/AliITSVertexerZTest.C
@@ -1,5 +1,6 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include <TFile.h>
+#include <TGeoManager.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TTree.h>
@@ -7,7 +8,8 @@
 #include <AliRun.h>
 #include <AliHeader.h>
 #include <AliGenEventHeader.h>
-#include <AliITSVertexerPPZ.h>
+#include <AliGeomManager.h>
+#include <AliITSVertexerZ.h>
 #include <AliRunLoader.h>
 #include <AliITSLoader.h>
 
@@ -37,24 +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;
   }
-  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);
-  dovert->SetDebug(0);
-  dovert->SetDiffPhiMax(delphi);
-  dovert->SetWindow(window);
+  AliITSVertexerZ *dovert = new AliITSVertexerZ(initx,inity);
+  dovert->Init("default");
+  //dovert->SetDebug(0);
+  //  dovert->SetDiffPhiMax(delphi);
+  //  dovert->SetWindow(window);
   dovert->PrintStatus();
-  Int_t meno100=0;
-  Int_t meno200=0;
-  Int_t meno110=0;
   Int_t sigmazero=0;
-  AliITSVertex *vert = 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,46 +59,35 @@ 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->GetZ())*10000.<<endl;
+      } else {
+	cout<<"NOT FOUND"<<endl;
       }
-      else {
-	cout<<"NOT FOUND - fZFound= "<<dovert->GetZFound();
-	cout<<" fZsig= "<<dovert->GetZsig()<<endl;
-	if(dovert->GetZFound() == -100) meno100++;
-	if(dovert->GetZFound() == -200) meno200++;
-	if(dovert->GetZFound() == -110) meno110++;
-      }
-      cout <<" True Z position "<<primaryVertex[2]<<", diff= ";
-      cout<<(primaryVertex[2]-dovert->GetZFound())*10000.<<endl;
     }
     if(vert){
-      Double_t pos[3];
-      for(Int_t kk=0;kk<3;kk++)pos[kk]=(Double_t)primaryVertex[kk];
-      vert->SetTruePos(pos);
-      Float_t found = vert->GetZv();
+      Float_t found = vert->GetZ();
       diff2->Fill(primaryVertex[2],found);
       found = 10000.*(found-primaryVertex[2]);
       if(vert->GetZRes()!=0){
 	diff1->Fill(found);
-      }
-      else {
+      } else {
 	sigmazero++;
       }
       dovert->WriteCurrentVertex();
     }
   }
   if(kDebug>0){
-    cout<<"Number of bad vertices with code  -100: "<<meno100<<endl;
-    cout<<"Number of bad vertices with code  -110: "<<meno110<<endl;
-    cout<<"Number of bad vertices with code  -200: "<<meno200<<endl;
     cout<<"Only one tracklet (sigma = 0) "<<sigmazero<<endl;
   }
-
+  
 }