new Class AliRICHDisplFast added

[u/mrichter/AliRoot.git] / RICH / RICHpatrec.C

diff --git a/RICH/RICHpatrec.C b/RICH/RICHpatrec.C
index b2e4c3ca4f33c3b8e589f91e688cf1b5ed28bbac..2ec71c84dc9ddcbb350e48462c819a4361f2c818 100644 (file)
--- a/RICH/RICHpatrec.C
+++ b/RICH/RICHpatrec.C
@@ -1,57 +1,26 @@
-RICHpatrec (Int_t evNumber1=0,Int_t evNumber2=0) {
-// Dynamically link some shared libs
- 
-    if (gClassTable->GetID("AliRun") < 0) {
-       gROOT->LoadMacro("loadlibs.C");
-       loadlibs();
-    }
-    else {
-      //delete gAlice;
-      gAlice = 0;
-    }
-// Connect the Root Galice file containing Geometry, Kine and Hits
+RICHpatrec (Int_t evNumber1=0,Int_t evNumber2=0)
+{
+  if(gAlice) delete gAlice;      
+  AliRunLoader *al;
+  AliRun *a;
+  
+  if(!(al=AliRunLoader::Open("galice.root","AlicE","update")))
+    Fatal("ReadAlice","galice.root broken");
+  
+  al->LoadgAlice();
+  if(!gAlice) Fatal("ReadAlice","No gAlice in file");
+  a=al->GetAliRun();
+  
+  AliRICHPatRec *detect = new AliRICHPatRec("RICH patrec algorithm","Reconstruction");
     
-    TFile *file = (TFile*)gROOT->GetListOfFiles()->FindObject("galice.root");
-    if (file) file->Close(); 
-    file = new TFile("galice.root","UPDATE");
-    file->ls();
-    
-    //printf ("I'm after Map \n");
-    
-// Get AliRun object from file or create it if not on file
-    
-    if (!gAlice) {
-       gAlice = (AliRun*)file->Get("gAlice");
-       if (gAlice) printf("AliRun object found on file\n");
-       if (!gAlice) gAlice = new AliRun("gAlice","RICH reconstruction program");
-    }else {
-      delete gAlice;
-      gAlice = (AliRun*)file->Get("gAlice");
-       if (gAlice) printf("AliRun object found on file\n");
-       if (!gAlice) gAlice = new AliRun("gAlice","Alice test program");
-    }
-    
-    //printf ("I'm after gAlice \n");
-    
-    AliRICH *RICH  = (AliRICH*) gAlice->GetDetector("RICH"); 
-    
-    // Create Recontruction algorithm object
-    AliRICHPatRec *detect = new AliRICHPatRec("RICH patrec algorithm","Reconstruction");
-    
-// Reconstruct
-    // Event Loop
-    //
-    for (int nev=0; nev<= evNumber2; nev++) {
-      Int_t nparticles = gAlice->GetEvent(nev);
+
+    for (int nev=0; nev<= evNumber2; nev++) {    // Event Loop
+      Int_t nparticles = al->GetEvent(nev);
       cout <<endl<< "Processing event:" <<nev<<endl;
       cout << "Particles       :" <<nparticles<<endl;
       if (nev < evNumber1) continue;
       if (nparticles <= 0) return;
-      if (RICH) detect->PatRec();
-      char hname[30];
-      sprintf(hname,"TreeR%d",nev);
-      gAlice->TreeR()->Write(hname);
-      gAlice->TreeR()->Reset();
+      detect->PatRec();
    } // event loop  
    
     printf("\nEnd of Macro*************************************\n");