Update to track display by Chuncheng

diff --git a/TRD/AliTRDdisplayTracks.C b/TRD/AliTRDdisplayTracks.C
index d38f1de943db7eb94b8a9bbccc1b12133fc1cbf6..a10f1ecb80449b65806a77b78a7de06e8b97ef7f 100644 (file)
--- a/TRD/AliTRDdisplayTracks.C
+++ b/TRD/AliTRDdisplayTracks.C
@@ -1,10 +1,10 @@
-void AliTRDdisplayTracks(Int_t track) 
+void AliTRDdisplayTracks(Int_t track=157) 

 {
 
   c1 = new TCanvas( "RecPoints", "RecPoints Display", 10, 10, 710, 740);
   c1->SetFillColor(1);
   TView *v=new TView(1);
 {
 
   c1 = new TCanvas( "RecPoints", "RecPoints Display", 10, 10, 710, 740);
   c1->SetFillColor(1);
   TView *v=new TView(1);

-
+  

       v->SetRange(-350.,-350.,-400.,350.,350.,400.); // full
   //  v->SetRange(0.,0.,0.,350.,350.,400.);  // top right
   //  v->SetRange(-350.,0.,0.,0.,350.,400.); // top left
       v->SetRange(-350.,-350.,-400.,350.,350.,400.); // full
   //  v->SetRange(0.,0.,0.,350.,350.,400.);  // top right
   //  v->SetRange(-350.,0.,0.,0.,350.,400.); // top left


@@ -27,7 +27,9 @@ void AliTRDdisplayTracks(Int_t track)
    TFile *tf=TFile::Open("AliTRDtracks.root");
    if (!tf->IsOpen()) {cerr<<"Can't open AliTRDtracks.root !\n"; return 3;}
    TObjArray tarray(2000);
    TFile *tf=TFile::Open("AliTRDtracks.root");
    if (!tf->IsOpen()) {cerr<<"Can't open AliTRDtracks.root !\n"; return 3;}
    TObjArray tarray(2000);

-   TTree *tracktree=(TTree*)tf->Get("TreeT");
+   //  tf->ls();
+   TTree *tracktree=(TTree*)tf->Get("TreeT0_TRD");
+   //   tracktree->ls();

    TBranch *tbranch=tracktree->GetBranch("tracks");
    Int_t nentr=tracktree->GetEntries();
    cerr<<"Found "<<nentr<<" entries in the track tree"<<endl;
    TBranch *tbranch=tracktree->GetBranch("tracks");
    Int_t nentr=tracktree->GetEntries();
    cerr<<"Found "<<nentr<<" entries in the track tree"<<endl;


@@ -42,19 +44,22 @@ void AliTRDdisplayTracks(Int_t track)
 
 
   // Load clusters
 
 
   // Load clusters

-  Char_t *alifile = "AliTRDclusters.root";
+  Char_t *alifile = "TRDclusters.root";

   Int_t   nEvent  = 0;
   TObjArray rparray(2000);
   TObjArray *RecPointsArray = &rparray;
   Int_t   nEvent  = 0;
   TObjArray rparray(2000);
   TObjArray *RecPointsArray = &rparray;

-  AliTRDtracker *Tracker = new AliTRDtracker("dummy","dummy");
-  Tracker->ReadClusters(RecPointsArray,alifile,-1); 
+  const TFile *geofile =TFile::Open(alifile);
+  //  AliTRDtracker *Tracker = new AliTRDtracker("dummy","dummy");
+  AliTRDtracker *Tracker = new AliTRDtracker(geofile);
+   Tracker->ReadClusters(RecPointsArray,alifile); 

   Int_t nRecPoints = RecPointsArray->GetEntriesFast();
   cerr<<"Found "<<nRecPoints<<" rec. points"<<endl;
 
 
   // Connect the AliRoot file containing Geometry, Kine, Hits, and Digits
   Int_t nRecPoints = RecPointsArray->GetEntriesFast();
   cerr<<"Found "<<nRecPoints<<" rec. points"<<endl;
 
 
   // Connect the AliRoot file containing Geometry, Kine, Hits, and Digits

-  alifile = "galice.root";
-  TFile *gafl = (TFile*) gROOT->GetListOfFiles()->FindObject(alifile);
+      alifile = "galice.root";
+
+   TFile *gafl = (TFile*) gROOT->GetListOfFiles()->FindObject(alifile);

   if (!gafl) {
     cout << "Open the ALIROOT-file " << alifile << endl;
     gafl = new TFile(alifile);
   if (!gafl) {
     cout << "Open the ALIROOT-file " << alifile << endl;
     gafl = new TFile(alifile);


@@ -62,6 +67,7 @@ void AliTRDdisplayTracks(Int_t track)
   else {
     cout << alifile << " is already open" << endl;
   }
   else {
     cout << alifile << " is already open" << endl;
   }

+  

 
   // Get AliRun object from file or create it if not on file
   gAlice = (AliRun*) gafl->Get("gAlice");
 
   // Get AliRun object from file or create it if not on file
   gAlice = (AliRun*) gafl->Get("gAlice");


@@ -69,11 +75,12 @@ void AliTRDdisplayTracks(Int_t track)
     cout << "AliRun object found on file" << endl;
   else
     gAlice = new AliRun("gAlice","Alice test program");
     cout << "AliRun object found on file" << endl;
   else
     gAlice = new AliRun("gAlice","Alice test program");

+       

 
 

-
-  AliTRDv1       *TRD           = (AliTRDv1*) gAlice->GetDetector("TRD");
-  AliTRDgeometry *fGeom   = TRD->GetGeometry();   
-
+       AliTRDparameter *par =  ( AliTRDparameter *par) gafl->Get("TRDparameter");
+       AliTRDv1       *TRD           = (AliTRDv1*) gAlice->GetDetector("TRD");
+       AliTRDgeometry *fGeom   = TRD->GetGeometry();   
+       

   Int_t i,j,index,det,sector, ti[3];
   Double_t x,y,z, cs,sn,tmp;
   Float_t global[3], local[3];
   Int_t i,j,index,det,sector, ti[3];
   Double_t x,y,z, cs,sn,tmp;
   Float_t global[3], local[3];


@@ -83,52 +90,70 @@ void AliTRDdisplayTracks(Int_t track)
 
   for (Int_t i = 0; i < nRecPoints; i++) {
     printf("\r point %d out of %d",i,nRecPoints);
 
   for (Int_t i = 0; i < nRecPoints; i++) {
     printf("\r point %d out of %d",i,nRecPoints);

-    AliTRDrecPoint *rp = (AliTRDrecPoint *) RecPointsArray->UncheckedAt(i);    
-
-    local[0]=rp->GetLocalRow(); 
-    local[1]=rp->GetLocalCol(); 
-    local[2]=rp->GetLocalTime();
-    det=rp->GetDetector();
+    AliTRDcluster *rp = (AliTRDcluster *) RecPointsArray->UncheckedAt(i);    
+  
+   Int_t  idet=rp->GetDetector();
+   Int_t iplan = fGeom->GetPlane(idet);    
+   Int_t itt=rp->GetLocalTimeBin();
+   Float_t  timeSlice = itt+0.5; 
+   Float_t  time0     = par->GetTime0(iplan);
+
+  // calculate (x,y,z) position in rotated chamber
+   local[0] = time0 - (timeSlice - par->GetTimeBefore()) 
+         * par->GetTimeBinSize();
+   local[1]=rp->GetY();
+   local[2]=rp->GetZ(); 

 
     for (j = 0; j < 3; j++) { ti[j] = rp->GetTrackIndex(j); }
 
     if((track < 0) ||
        ((ti[0]==track)||(ti[1]==track)||(ti[2]==track))) {
 
 
     for (j = 0; j < 3; j++) { ti[j] = rp->GetTrackIndex(j); }
 
     if((track < 0) ||
        ((ti[0]==track)||(ti[1]==track)||(ti[2]==track))) {
 

-      if(fGeom->Local2Global(det,local,global)) {     
-       x=global[0]; y=global[1]; z=global[2];
-       pm->SetPoint(i,x,y,z);
-      }
+        if(fGeom->RotateBack(idet,local,global)) {     
+               x=global[0]; y=global[1]; z=global[2];
+               pm->SetPoint(i,x,y,z);
+         }
+

     }
   }
 
   pm->SetMarkerSize(1); pm->SetMarkerColor(10); pm->SetMarkerStyle(1);
   pm->Draw();
   
     }
   }
 
   pm->SetMarkerSize(1); pm->SetMarkerColor(10); pm->SetMarkerStyle(1);
   pm->Draw();
   

+   AliTRDparameter *par =  ( AliTRDparameter *par) gafl->Get("TRDparameter");

 
   Int_t ntracks = tarray.GetEntriesFast();
 
   for (i = 0; i < ntracks; i++) {
     AliTRDtrack *pt = (AliTRDtrack *) tarray.UncheckedAt(i), &t=*pt;
 
   Int_t ntracks = tarray.GetEntriesFast();
 
   for (i = 0; i < ntracks; i++) {
     AliTRDtrack *pt = (AliTRDtrack *) tarray.UncheckedAt(i), &t=*pt;

-    Int_t nclusters = t.GetNclusters();
+    Int_t nclusters = t.GetNumberOfClusters();

     cerr<<"in track "<<i<<" found "<<nclusters<<" clusters"<<endl;
    
     TPolyMarker3D *pm = new TPolyMarker3D(nclusters);
     for(j = 0; j < nclusters; j++) {
       index = t.GetClusterIndex(j);
     cerr<<"in track "<<i<<" found "<<nclusters<<" clusters"<<endl;
    
     TPolyMarker3D *pm = new TPolyMarker3D(nclusters);
     for(j = 0; j < nclusters; j++) {
       index = t.GetClusterIndex(j);

-      AliTRDrecPoint *rp = (AliTRDrecPoint *) RecPointsArray->UncheckedAt(index);    
-      local[0]=rp->GetLocalRow(); 
-      local[1]=rp->GetLocalCol(); 
-      local[2]=rp->GetLocalTime();
-      det=rp->GetDetector();
-
-      if(fGeom->Local2Global(det,local,global)) {     
-       x=global[0]; y=global[1]; z=global[2];
-       pm->SetPoint(j,x,y,z);
-      }
+      AliTRDcluster *rp = (AliTRDcluster *) RecPointsArray->UncheckedAt(index); 
+
+   Int_t  idet=rp->GetDetector();
+   Int_t iplan = fGeom->GetPlane(idet);    
+   Int_t itt=rp->GetLocalTimeBin();
+   Float_t  timeSlice = itt+0.5; 
+   Float_t  time0     = par->GetTime0(iplan);
+
+
+  // calculate (x,y,z) position in rotated chamber
+       local[0] = time0 - (timeSlice - par->GetTimeBefore()) 
+         * par->GetTimeBinSize();
+       local[1]=rp->GetY(); 
+       local[2]=rp->GetZ();
+
+            if(fGeom->RotateBack(idet,local,global)) {     
+       x=global[0]; y=global[1]; z=global[2];
+       pm->SetPoint(j,x,y,z);
+       }

     } 
     pm->SetMarkerSize(1); pm->SetMarkerColor(i%6+3); pm->SetMarkerStyle(1);
     } 
     pm->SetMarkerSize(1); pm->SetMarkerColor(i%6+3); pm->SetMarkerStyle(1);

-    pm->Draw();
+    //    pm->Draw();

   }
   
   TGeometry *geom=(TGeometry*)gafl->Get("AliceGeom");
   }
   
   TGeometry *geom=(TGeometry*)gafl->Get("AliceGeom");