Modifications for the xlc compiler

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

diff --git a/TRD/AliTRDpid.cxx b/TRD/AliTRDpid.cxx
index 63c357ead63825987a742f46059151566352f197..0f25a7d91ce909bc23953594795e7312f5d1bcd6 100644 (file)
--- a/TRD/AliTRDpid.cxx
+++ b/TRD/AliTRDpid.cxx
@@ -13,27 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.4.6.1  2002/07/24 10:09:30  alibrary
-Updating VirtualMC
-
-Revision 1.5  2002/06/12 09:54:35  cblume
-Update of tracking code provided by Sergei
-
-Revision 1.4  2001/11/19 08:44:08  cblume
-Fix bugs reported by Rene
-
-Revision 1.3  2001/11/14 10:50:46  cblume
-Changes in digits IO. Add merging of summable digits
-
-Revision 1.2  2001/11/06 17:19:41  cblume
-Add detailed geometry and simple simulator
-
-Revision 1.1  2001/05/07 08:08:05  cblume
-Update of TRD code
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -56,12 +36,12 @@ Update of TRD code
 #include <TParticle.h>
 
 #include "AliRun.h"
-#include "AliTRD.h"
 #include "AliTRDpid.h"
 #include "AliTRDcluster.h"
 #include "AliTRDtrack.h"
 #include "AliTRDtracker.h"
 #include "AliTRDgeometry.h"
+#include "AliMC.h"
 
 ClassImp(AliTRDpid)
 
@@ -107,7 +87,7 @@ AliTRDpid::AliTRDpid(const char* name, const char* title):TNamed(name,title)
 }
 
 //_____________________________________________________________________________
-AliTRDpid::AliTRDpid(const AliTRDpid &p)
+AliTRDpid::AliTRDpid(const AliTRDpid &p):TNamed(p)
 {
   //
   // AliTRDpid copy constructor
@@ -331,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");
@@ -371,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 -- ");
@@ -491,7 +469,7 @@ Int_t AliTRDpid::MCpid(const AliTRDtrack *t)
       }
       if (accept) {
 
-        particle = gAlice->Particle(track0);
+        particle = gAlice->GetMCApp()->Particle(track0);
         if (particle->GetFirstMother() == -1) {
           switch (TMath::Abs(particle->GetPdgCode())) {
           case kPdgEl:
@@ -597,7 +575,7 @@ Int_t AliTRDpid::MCpid(const AliTRDtrack *t, Int_t *pdg
 
       Int_t trackIndex = cluster->GetLabel(iTrack);
       if (trackIndex >= 0) {
-        particle = gAlice->Particle(trackIndex);
+        particle = gAlice->GetMCApp()->Particle(trackIndex);
         Int_t  pdgCode = particle->GetPdgCode(); 
         Bool_t newPart = kTRUE;
         for (iPart = 0; iPart < nPart; iPart++) {