X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliCascadeComparison.C;h=34429532ddf41fdc261a288942d59966cefbd495;hb=30cd6a86dcdd3c1f195019d83b1ab55fa0e52281;hp=31a3085dbe30602527ee14b9636eb22ea3116a09;hpb=c7bafca9a7bac3b63264cb649d33a8172a486e94;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliCascadeComparison.C b/STEER/AliCascadeComparison.C
index 31a3085dbe3..34429532ddf 100644
--- a/STEER/AliCascadeComparison.C
+++ b/STEER/AliCascadeComparison.C
@@ -7,6 +7,7 @@
  *  Origin: Christian Kuhn, IReS, Strasbourg, christian.kuhn@ires.in2p3.fr  *
  ****************************************************************************/
 
+#include <TPDGCode.h>
 #if !defined(__CINT__) || defined(__MAKECINT__)
   #include <TMath.h>
   #include <TError.h>
@@ -27,12 +28,8 @@
   #include "AliTrackReference.h"
   #include "AliRunLoader.h"
   #include "AliRun.h"
-  #include "AliESD.h"
-#else
-const Int_t kXiMinus    = 3312;
-const Int_t kXiPlusBar  = -3312;
-const Int_t kOmegaMinus = 3334;
-const Int_t kOmegaPlusBar = -3334;
+  #include "AliESDEvent.h"
+  #include "AliESDcascade.h"
 #endif
 
 Int_t GoodCascades(const Char_t *dir=".");
@@ -190,13 +187,13 @@ Int_t AliCascadeComparison(Int_t code=3312, const Char_t *dir=".") {
          return 5;
       }
    }
-   AliESD* event = new AliESD;
+   AliESDEvent* event = new AliESDEvent();
    TTree* esdTree = (TTree*) ef->Get("esdTree");
    if (!esdTree) {
       ::Error("AliCascadeComparison.C", "no ESD tree found");
       return 6;
    }
-   esdTree->SetBranchAddress("ESD", &event);
+   event->ReadFromTree(esdTree);
 
 
    //******* Loop over events *********
@@ -321,13 +318,14 @@ Int_t AliCascadeComparison(Int_t code=3312, const Char_t *dir=".") {
    } //**** End of the loop over events
 
    delete event;
+   delete esdTree;
    ef->Close();
 
    delete csTree;
    refFile->Close();
 
-   Stat_t ng=hgood->GetEntries(), nf=hfound->GetEntries();
-   if (ng!=0) cout<<"Integral efficiency is about "<<nf/ng*100.<<" %\n";
+   Stat_t ngg=hgood->GetEntries(), nf=hfound->GetEntries();
+   if (ngg!=0) cout<<"Integral efficiency is about "<<nf/ngg*100.<<" %\n";
    cout<<
    "Total number of found cascades: "<<allfound<<" ("<<nf<<" in the peak)\n";
    cout<<"Total number of \"good\" cascades: "<<allgood<<endl;
@@ -429,7 +427,7 @@ Int_t AliCascadeComparison(Int_t code=3312, const Char_t *dir=".") {
 
 Int_t GoodCascades(const Char_t *dir) {
    if (gAlice) {
-      delete gAlice->GetRunLoader();
+      delete AliRunLoader::Instance();
       delete gAlice; 
       gAlice=0;
    }