Additional prrotection

[u/mrichter/AliRoot.git] / DISPLAY / AliDisplayClusters.cxx

diff --git a/DISPLAY/AliDisplayClusters.cxx b/DISPLAY/AliDisplayClusters.cxx
index f8574bed886b3e9769950c296b54a77170ee7893..fb8276cfc185c03f348ca9e1fbb42a40b289bbaf 100644 (file)
--- a/DISPLAY/AliDisplayClusters.cxx
+++ b/DISPLAY/AliDisplayClusters.cxx
@@ -20,25 +20,23 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include <Riostream.h>
+#include <TFile.h>
 #include <TPolyMarker3D.h>
 
+#include "AliClusters.h"
+#include "AliDisplay2.h"
 #include "AliDisplayClusters.h"
+#include "AliITSLoader.h"
+#include "AliITSclusterV2.h"
+#include "AliITSgeom.h"
 #include "AliModuleInfo.h"
-
 #include "AliRun.h"
 #include "AliRunLoader.h"
-#include "AliITS.h"
-#include "AliITSLoader.h"
-#include "AliITSgeom.h"
-#include "AliITSclusterV2.h"
-#include "AliTPCParam.h"
 #include "AliTPCLoader.h"
-#include "AliClusters.h"
-#include "AliTPCcluster.h"
-
-#include "AliDisplay2.h"
+#include "AliTPCParam.h"
+#include "AliTPCclusterMI.h"
 
-ClassImp(AliDisplayClusters);
+ClassImp(AliDisplayClusters)
 
 //_____________________________________________________________
 AliDisplayClusters::AliDisplayClusters()
@@ -92,7 +90,6 @@ void AliDisplayClusters::LoadITSClusters(Int_t nevent)
     return;
   }
   AliITSLoader *itsl = (AliITSLoader*)rl->GetLoader("ITSLoader");
-  AliITS *its  = (AliITS*)gAlice->GetModule("ITS");
   
   rl->GetEvent(nevent);
   itsl->LoadRecPoints();
@@ -103,7 +100,10 @@ void AliDisplayClusters::LoadITSClusters(Int_t nevent)
     return;
   }
 
-  AliITSgeom *geom=its->GetITSgeom();
+  TDirectory * olddir = gDirectory;
+  rl->CdGAFile();
+  AliITSgeom *geom = (AliITSgeom*)gDirectory->Get("AliITSgeom"); 
+  olddir->cd(); 
   Int_t count = 0;
 
   TClonesArray *clusters=new TClonesArray("AliITSclusterV2",10000);
@@ -175,7 +175,7 @@ void AliDisplayClusters::LoadTPCClusters(Int_t nevent)
   Float_t noiseth = 10;
 
    AliClusters *clusters=new AliClusters(); 
-   clusters->SetClass("AliTPCcluster");
+   clusters->SetClass("AliTPCclusterMI");
 
    cTree->SetBranchAddress("Segment",&clusters);
 
@@ -187,7 +187,7 @@ void AliDisplayClusters::LoadTPCClusters(Int_t nevent)
        TClonesArray &clrow=*clusters->GetArray();
        Int_t ncl=clrow.GetEntriesFast();
        while (ncl--) {
-           AliTPCcluster *cl=(AliTPCcluster*)clrow[ncl];
+           AliTPCclusterMI *cl=(AliTPCclusterMI*)clrow[ncl];
            Double_t x=dig->GetPadRowRadii(sec,row), y=cl->GetY(), z=cl->GetZ();
           if (cl->GetQ()<noiseth) continue;
            Float_t cs, sn, tmp;