X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSpidESD2.cxx;h=801b92b3efeebb6ef5eb044babd4650bde246b2b;hb=542c6c71f0d88691163246a4e684e8d9d8a2b6fb;hp=cbf096652e4f53ab85f39f304d19140d8adf8bf9;hpb=af885e0fc45eeab1177d3d34f858ccd8836787fb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSpidESD2.cxx b/ITS/AliITSpidESD2.cxx
index cbf096652e4..801b92b3efe 100644
--- a/ITS/AliITSpidESD2.cxx
+++ b/ITS/AliITSpidESD2.cxx
@@ -13,6 +13,8 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
+/* $Id$ */
+
 //-----------------------------------------------------------------------//
 // ITS PID class --- method # 2                                          //
 //                                                                       //
@@ -38,20 +40,16 @@ ClassImp(AliITSpidESD2)
 //_________________________________________________________________________
   AliITSpidESD2::AliITSpidESD2():AliITSpidESD(),
 fTracker(0),
-fLoader(0),
 fSp(0)
 { //
   //  The main constructor
 }
 //_________________________________________________________________________
-AliITSpidESD2::AliITSpidESD2(AliITStrackerMI* tracker,AliITSLoader* loader):AliITSpidESD(),
-fTracker(0),
-fLoader(0),
+AliITSpidESD2::AliITSpidESD2(AliITStrackerMI* tracker):AliITSpidESD(),
+fTracker(tracker),
 fSp(0)
 { //
   //  The main constructor
-  fTracker=tracker;
-  fLoader=loader;
   fSp=new AliITSSteerPid();
   fSp->InitLayer();
 }
@@ -65,7 +63,6 @@ AliITSpidESD2::~AliITSpidESD2(){
 //______________________________________________________________________
 AliITSpidESD2::AliITSpidESD2(const AliITSpidESD2 &ob) :AliITSpidESD(ob),
 fTracker(ob.fTracker),
-fLoader(ob.fLoader),
 fSp(ob.fSp) 
 {
   // Copy constructor
@@ -81,7 +78,7 @@ AliITSpidESD2& AliITSpidESD2::operator=(const AliITSpidESD2& ob ){
 }
 
 //_________________________________________________________________________
-Int_t AliITSpidESD2::MakePID(AliESDEvent *event)
+Int_t AliITSpidESD2::MakePID(TTree *clustersTree, AliESDEvent *event)
 {
 
   //
@@ -89,9 +86,7 @@ Int_t AliITSpidESD2::MakePID(AliESDEvent *event)
   //
   Double_t xr,par[5];
   AliITStrackV2* track=0;
-  fLoader->LoadRecPoints();
-  TTree *cTree=fLoader->TreeR();
-  fTracker->LoadClusters(cTree);
+  fTracker->LoadClusters(clustersTree);
   printf("==== Landau Fit PID ITS ====== \n");
   Int_t ntrk=event->GetNumberOfTracks();
   Double_t momits;
@@ -123,19 +118,19 @@ Int_t AliITSpidESD2::MakePID(AliESDEvent *event)
     }
     AliITSRecPoint* cluarr[12];
     Float_t qclu[8],qclucorr[8],nlay[8];
-    for(Int_t i=0;i<8;i++){
-      qclu[i]=0;
-      qclucorr[i]=0;
-      nlay[i]=0;
+    for(Int_t ii=0;ii<8;ii++){
+      qclu[ii]=0;
+      qclucorr[ii]=0;
+      nlay[ii]=0;
     }
     Int_t jj=0;
-    for(Int_t i=0;i<12;i++){
-      cluind[i]=track->GetClusterIndex(i);
-      if(cluind[i]>0){
-	cluarr[i]=(AliITSRecPoint*)fTracker->GetCluster(cluind[i]);
-	Int_t lay=cluarr[i]->GetLayer();
+    for(Int_t ij=0;ij<12;ij++){
+      cluind[ij]=track->GetClusterIndex(ij);
+      if(cluind[ij]>0){
+	cluarr[ij]=(AliITSRecPoint*)fTracker->GetCluster(cluind[ij]);
+	Int_t lay=cluarr[ij]->GetLayer();
 	if(lay>1){//sdd+ssd only
-	  qclu[jj]=cluarr[i]->GetQ(); 
+	  qclu[jj]=cluarr[ij]->GetQ(); 
 	  qclucorr[jj]=qclu[jj]*TMath::Sqrt((1-snp*snp)/(1+tgl*tgl));
 	  nlay[jj]=lay;
 	  jj++;
@@ -158,8 +153,7 @@ Int_t AliITSpidESD2::MakePID(AliESDEvent *event)
     esdtr->SetITSpid(condprobfun);
 
     delete track;
-   }
+  }
   fTracker->UnloadClusters();
-  fLoader->UnloadRecPoints();
   return 0;
 }