new digitization and reconstruction corresponded to new data format

[u/mrichter/AliRoot.git] / TRD / AliTRDpid.cxx

diff --git a/TRD/AliTRDpid.cxx b/TRD/AliTRDpid.cxx
index d42e656693f0ca302e5f98038b663b899b97cc20..090ce93203167661b653d7dd4e89063e07cf6c2b 100644 (file)
--- a/TRD/AliTRDpid.cxx
+++ b/TRD/AliTRDpid.cxx
@@ -36,7 +36,6 @@
 #include <TParticle.h>
 
 #include "AliRun.h"
-#include "AliTRD.h"
 #include "AliTRDpid.h"
 #include "AliTRDcluster.h"
 #include "AliTRDtrack.h"
@@ -137,7 +136,7 @@ AliTRDpid &AliTRDpid::operator=(const AliTRDpid &p)
 }
 
 //_____________________________________________________________________________
-void AliTRDpid::Copy(TObject &p)
+void AliTRDpid::Copy(TObject &p) const
 {
   //
   // Copy function
@@ -312,14 +311,7 @@ Bool_t AliTRDpid::ReadKine(const Char_t *name, Int_t event)
   }
   gAlice->GetEvent(event);
 
-  AliTRD *trd = (AliTRD *) gAlice->GetDetector("TRD");
-  if (!trd) {
-    printf("AliTRDpid::ReadKine -- ");
-    printf("No TRD object found\n");    
-    return kFALSE;
-  }
-
-  fGeometry = trd->GetGeometry();
+  fGeometry = AliTRDgeometry::GetGeometry(gAlice->GetRunLoader());
   if (!fGeometry) {
     printf("AliTRDpid::ReadKine -- ");
     printf("No TRD geometry found\n");
@@ -352,7 +344,12 @@ Bool_t AliTRDpid::ReadCluster(const Char_t *name)
   printf("Open file %s\n",name);
 
   AliTRDtracker *tracker = new AliTRDtracker();
-  tracker->ReadClusters(fClusterArray,name);
+  TFile* file = TFile::Open(name);
+  file->cd("Event0");
+  TTree* tree = (TTree*) file->Get("TreeD");
+  tracker->ReadClusters(fClusterArray,tree);
+  file->Close();
+  delete file;
 
   if (!fClusterArray) {
     printf("AliTRDpid::ReadCluster -- ");