Using the recommended way of forward declarations for TVector and TMatrix (see v5...

[u/mrichter/AliRoot.git] / TPC / AliTPCDisplayClusters.C

diff --git a/TPC/AliTPCDisplayClusters.C b/TPC/AliTPCDisplayClusters.C
index 2663f53d0e440130cbb43d1b427b0dac0b17f8cf..df91baf2330820f9bc5591ac34676da72d11ec11 100644 (file)
--- a/TPC/AliTPCDisplayClusters.C
+++ b/TPC/AliTPCDisplayClusters.C
@@ -1,3 +1,22 @@
+/****************************************************************************
+ *           Origin: I.Belikov, CERN, Jouri.Belikov@cern.ch                 *
+ ****************************************************************************/
+
+#ifndef __CINT__
+#include <Riostream.h>
+#include <TFile.h>
+#include <TTree.h>
+#include <TCanvas.h>
+#include <TView.h>
+#include <TPolyMarker3D.h>
+#include <TNode.h>
+#include <TGeometry.h>
+
+#include "AliTPCParam.h"
+#include "AliClusters.h"
+#include "AliTPCcluster.h"
+#endif
+
 Int_t AliTPCDisplayClusters(Int_t eventn=0, Int_t noiseth=15) {
    cerr<<"Displaying clusters...\n";
 
@@ -7,7 +26,7 @@ Int_t AliTPCDisplayClusters(Int_t eventn=0, Int_t noiseth=15) {
    TFile *cf=TFile::Open("AliTPCclusters.root");
    if (!cf->IsOpen()){cerr<<"Can't open AliTPCclusters.root !\n"; return 3;}
 
-   AliTPCParam *dig=(AliTPCParam *)cf->Get("75x40_100x60");
+   AliTPCParam *dig=(AliTPCParam *)cf->Get("75x40_100x60_150x60");
    if (!dig) {cerr<<"TPC parameters have not been found !\n"; return 2;}
 
    TCanvas *c1=new TCanvas("cdisplay", "Cluster display",0,0,700,730);
@@ -18,20 +37,26 @@ Int_t AliTPCDisplayClusters(Int_t eventn=0, Int_t noiseth=15) {
    c1->SetTheta(90.);
    c1->SetPhi(0.);
 
-   AliTPCClustersArray *ca=new AliTPCClustersArray;
-   ca->Setup(dig);
-   ca->SetClusterType("AliTPCcluster");
    char  cname[100];
    sprintf(cname,"TreeC_TPC_%d",eventn);
+   TTree *cTree=(TTree *)cf->Get(cname);
+   if (!cTree) {
+     cerr<<"Can't find tree : "<<cname<<endl;
+     return 1;
+   }
+
+   AliClusters *clusters=new AliClusters(); 
+   clusters->SetClass("AliTPCcluster");
+
+   cTree->SetBranchAddress("Segment",&clusters);
 
-   ca->ConnectTree(cname);
-   Int_t nrows=Int_t(ca->GetTree()->GetEntries());
+   Int_t nrows=Int_t(cTree->GetEntries());
    for (Int_t n=0; n<nrows; n++) {
-       AliSegmentID *s=ca->LoadEntry(n);
+       cTree->GetEvent(n);
        Int_t sec,row;
-       dig->AdjustSectorRow(s->GetID(),sec,row);
-       AliTPCClustersRow &clrow = *ca->GetRow(sec,row);
-       Int_t ncl=clrow.GetArray()->GetEntriesFast();
+       dig->AdjustSectorRow(clusters->GetID(),sec,row);
+       TClonesArray &clrow=*clusters->GetArray();
+       Int_t ncl=clrow.GetEntriesFast();
        TPolyMarker3D *pm=new TPolyMarker3D(ncl);
        while (ncl--) {
            AliTPCcluster *cl=(AliTPCcluster*)clrow[ncl];
@@ -42,16 +67,16 @@ Int_t AliTPCDisplayClusters(Int_t eventn=0, Int_t noiseth=15) {
            tmp = x*cs-y*sn; y= x*sn+y*cs; x=tmp;
            pm->SetPoint(ncl,x,y,z);
        }
-       ca->ClearRow(sec,row);
+       clrow.Clear();
        pm->SetMarkerSize(1); pm->SetMarkerColor(2); pm->SetMarkerStyle(1);
        pm->Draw();
    }
-   delete ca;
+   delete cTree;
+   delete dig;
    cf->Close();
 
    TGeometry *geom=(TGeometry*)file->Get("AliceGeom");
-   TList *list = geom->GetListOfNodes();
-   TNode * main = (geom->GetListOfNodes())->First();
+   TNode * main = (TNode*)((geom->GetListOfNodes())->First());
    TIter next(main->GetListOfNodes());
    TNode  *module=0;
    while((module = (TNode*)next())) {
@@ -66,7 +91,6 @@ Int_t AliTPCDisplayClusters(Int_t eventn=0, Int_t noiseth=15) {
      
    
    geom->Draw("same");
-   //v->Draw();
    c1->Modified(); c1->Update(); 
 
    file->Close();