Transition to NewIO

[u/mrichter/AliRoot.git] / HBTAN / AliHBTReaderITSv1.cxx

diff --git a/HBTAN/AliHBTReaderITSv1.cxx b/HBTAN/AliHBTReaderITSv1.cxx
index 8e50572164a9d76ae931842fadb4a13f81411610..8e96eec46a4746d97aeabb21161631d4a320052c 100644 (file)
--- a/HBTAN/AliHBTReaderITSv1.cxx
+++ b/HBTAN/AliHBTReaderITSv1.cxx
@@ -5,7 +5,7 @@
 #include "AliHBTParticle.h"
 #include "AliHBTParticleCut.h"
 
-#include <iostream.h>
+#include <Riostream.h>
 
 #include <TROOT.h>
 #include <TFile.h>
@@ -132,14 +132,6 @@ Int_t AliHBTReaderITSv1::Read(AliHBTRun* particles, AliHBTRun *tracks)
        delete iotrack;
        return 1;
     }
-   TFile *file = OpenTrackFile(currentdir);
-   if(file == 0x0)
-    {
-       Error("Read","Can not open the file with ITS tracks V1");
-       delete iotrack;
-       return 2;
-    }
-   
    if (gAlice->TreeE())//check if tree E exists
      {
       Nevents = (Int_t)gAlice->TreeE()->GetEntries();//if yes get number of events in gAlice
@@ -154,6 +146,14 @@ Int_t AliHBTReaderITSv1::Read(AliHBTRun* particles, AliHBTRun *tracks)
        delete iotrack;
        return 4;
      }
+
+   TFile *file = OpenTrackFile(currentdir);
+   if(file == 0x0)
+    {
+       Error("Read","Can not open the file with ITS tracks V1");
+       delete iotrack;
+       return 2;
+    }
     
    Int_t naccepted = 0;
    char tname[30];
@@ -186,8 +186,8 @@ Int_t AliHBTReaderITSv1::Read(AliHBTRun* particles, AliHBTRun *tracks)
         if (label < 0) 
          {
            continue;
-           delete iotrack;
          }
+
         TParticle *p = (TParticle*)gAlice->Particle(label);
         if(!p)
          {
@@ -197,7 +197,7 @@ Int_t AliHBTReaderITSv1::Read(AliHBTRun* particles, AliHBTRun *tracks)
         if(Pass(p->GetPdgCode())) continue; //check if we are intersted with particles of this type
                                            //if not take next partilce
 
-        AliHBTParticle* part = new AliHBTParticle(*p);
+        AliHBTParticle* part = new AliHBTParticle(*p,i);
         if(Pass(part)) { delete part; continue;}//check if meets all criteria of any of our cuts
                                                 //if it does not delete it and take next good track
         
@@ -211,7 +211,7 @@ Int_t AliHBTReaderITSv1::Read(AliHBTRun* particles, AliHBTRun *tracks)
         Double_t y= iotrack->GetY();
         Double_t z= iotrack->GetZ();
         
-        AliHBTParticle* track = new AliHBTParticle(p->GetPdgCode(), px, py , pz, tEtot, x, y, z, 0.);
+        AliHBTParticle* track = new AliHBTParticle(p->GetPdgCode(), i, px, py , pz, tEtot, x, y, z, 0.);
         if(Pass(track)) { delete  track;continue;}//check if meets all criteria of any of our cuts
                                                   //if it does not delete it and take next good track
 
@@ -252,9 +252,8 @@ TFile* AliHBTReaderITSv1::OpenTrackFile(Int_t ndir)
       return 0x0;
     }
    TString filename = dirname + "/" + fITSTracksFileName;
-   TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject(filename.Data());
-   if (!file) file = new TFile(filename.Data());
-   
+
+   TFile *file = TFile::Open(filename.Data());   
    if (!file)
     {
       Error("Read","Can not open file %s",filename.Data());