Use new AliESDRecXXXInfo

+
Removing ; problem

diff --git a/PWG1/AliGenInfo.cxx b/PWG1/AliGenInfo.cxx
index 0bb82ec686542ae7b391a87d3e2ebecd2c39185b..b2ae9168fb513598059bf93c6eea5d839f16898c 100644 (file)
--- a/PWG1/AliGenInfo.cxx
+++ b/PWG1/AliGenInfo.cxx
@@ -60,8 +60,8 @@ Container classes with MC infomation
 //
 // 
 
-ClassImp(AliTPCdigitRow);
-ClassImp(AliMCInfo);
+ClassImp(AliTPCdigitRow)
+ClassImp(AliMCInfo)
 ClassImp(AliGenV0Info)
 ClassImp(AliGenKinkInfo)
 

diff --git a/PWG1/AliGenInfoMaker.cxx b/PWG1/AliGenInfoMaker.cxx
index 712631c2b77ee8b703eb8e705bd6bd5c3ba2f47f..32ee03ec2459084efc5756bd321c1b23e98a5bcc 100644 (file)
--- a/PWG1/AliGenInfoMaker.cxx
+++ b/PWG1/AliGenInfoMaker.cxx
@@ -772,7 +772,7 @@ Int_t AliGenInfoMaker::TreeTRLoop()
     for (Int_t iTrackRef = 0; iTrackRef < trdArrayTR->GetEntriesFast(); iTrackRef++) {
       AliTrackReference *trackRef = (AliTrackReference*)trdArrayTR->At(iTrackRef);            
       //
-      if (trackRef->P()<fTPCPtCut) continue;
+      if (trackRef->P()<fTRDPtCut) continue;
       Int_t label = trackRef->GetTrack();      
       AliMCInfo * info = GetInfo(label);
       if ( (!info) && trackRef->Pt()<fTRDPtCut) continue;
@@ -829,6 +829,10 @@ Int_t AliGenInfoMaker::TreeTRLoop()
   return TreeTRLoopNew();
 }
 
+
+
+
+
 ////////////////////////////////////////////////////////////////////////
 Int_t AliGenInfoMaker::TreeTRLoopNew()
 {
@@ -847,6 +851,18 @@ Int_t AliGenInfoMaker::TreeTRLoopNew()
   //
   //
   //
+  for (Int_t ipart = 0; ipart<fStack->GetNtrack(); ipart++) {
+    TParticle * part = fStack->Particle(ipart);
+    if (!part) continue;
+    if (part->Pt()<fITSPtCut) continue;
+    if (part->R()>250.) continue;
+    if (TMath::Abs(part->Vz())>250.) continue;
+    if (TMath::Abs(part->Pz()/part->Pt())>2.5) continue; 
+    MakeInfo(ipart);
+  }
+  //
+  //
+
   for (Int_t iPrimPart = 0; iPrimPart<nPrimaries; iPrimPart++) {
     treeTR->GetEntry(iPrimPart);
     //
@@ -861,9 +877,9 @@ Int_t AliGenInfoMaker::TreeTRLoopNew()
       //
       if (trackRef->DetectorId()== AliTrackReference::kTPC){
        //
-       if (trackRef->P()<fTPCPtCut) continue;
        Int_t label = trackRef->GetTrack();      
        AliMCInfo * info = GetInfo(label);
+       if (!info && trackRef->Pt()<fTPCPtCut) continue;
        if (!info) info = MakeInfo(label);
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
@@ -875,9 +891,9 @@ Int_t AliGenInfoMaker::TreeTRLoopNew()
       //
       if (trackRef->DetectorId()== AliTrackReference::kITS){
        //
-       if (trackRef->P()<fITSPtCut) continue;
        Int_t label = trackRef->GetTrack();      
        AliMCInfo * info = GetInfo(label);
+       if (!info && trackRef->Pt()<fITSPtCut) continue;
        if (!info) info = MakeInfo(label);
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
@@ -889,9 +905,9 @@ Int_t AliGenInfoMaker::TreeTRLoopNew()
       //
       if (trackRef->DetectorId()== AliTrackReference::kTRD){
        //
-       if (trackRef->P()<fTRDPtCut) continue;
        Int_t label = trackRef->GetTrack();      
        AliMCInfo * info = GetInfo(label);
+       if (!info&&trackRef->P()<fTRDPtCut) continue;
        if (!info) info = MakeInfo(label);
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
@@ -903,9 +919,9 @@ Int_t AliGenInfoMaker::TreeTRLoopNew()
       //
       if (trackRef->DetectorId()== AliTrackReference::kTOF){
        //
-       if (trackRef->P()<fTOFPtCut) continue;
        Int_t label = trackRef->GetTrack();      
        AliMCInfo * info = GetInfo(label);
+       if (!info&&trackRef->P()<fTOFPtCut) continue;
        if (!info) info = MakeInfo(label);
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
@@ -917,9 +933,9 @@ Int_t AliGenInfoMaker::TreeTRLoopNew()
       //
       if (trackRef->DetectorId()== AliTrackReference::kDisappeared){
        //
-       if (!trackRef->TestBit(BIT(2))) continue;  //if not decay
        AliMCInfo * info = GetInfo(label);
        if (!info) continue;
+       //if (!trackRef->TestBit(BIT(2))) continue;  //if not decay
        info->fTRdecay = *trackRef;             
       }
       

diff --git a/PWG1/AliRecInfoMaker.cxx b/PWG1/AliRecInfoMaker.cxx
index 65cd9b7ebbb57bc62233c2f047024f0ac88b9ce4..af43e91837e395054ad190a80eeb269f7a2d4aac 100644 (file)
--- a/PWG1/AliRecInfoMaker.cxx
+++ b/PWG1/AliRecInfoMaker.cxx
@@ -166,7 +166,9 @@ TProfile prof("prof","prof",10,0.5,5);
 //
 #include "AliTreeDraw.h"
 #include "AliGenInfo.h"
-#include "AliRecInfo.h"
+#include "AliESDRecInfo.h"
+#include "AliESDRecV0Info.h"
+#include "AliESDRecKinkInfo.h"
 #include "AliRecInfoMaker.h"
 
 

diff --git a/PWG1/PWG1README.txt b/PWG1/PWG1README.txt
index 4ca6f1a45fc6bc8c9f283fa964ce71ef4302670b..5a90c3816ae165c02ec77c29cccb1a629a39a4a3 100644 (file)
--- a/PWG1/PWG1README.txt
+++ b/PWG1/PWG1README.txt
@@ -19,6 +19,7 @@ AliRecInfoMaker *t2 = new AliRecInfoMaker("genTracks.root","cmpESDTracks.root","
 t2->Exec();
 
 
+
 2. Make a chain of the information tree
 
 gSystem->Load("libPWG1.so");
@@ -27,7 +28,7 @@ gSystem->Load("libPWG1.so");
 .x ~/rootlogon.C
 .L /u/miranov/macroxrdproof64/AliXRDPROOFtoolkit.cxx+
  AliXRDPROOFtoolkit tool;
- TChain * chain = tool.MakeChain("comp.txt","ESDcmpTracks",0,1000)
+ TChain * chain = tool.MakeChain("pp.txt","ESDcmpTracks",0,1000)
  chain->Lookup();
  .L $ALICE_ROOT/PWG1/AliComparisonSelector.cxx+
 

diff --git a/PWG1/libPWG1.pkg b/PWG1/libPWG1.pkg
index a2df0d9459a8da4b8ef559c6dc5655a21c9a75bf..dac3579ca7fdd3710250ca98aaa4e90c812478b2 100644 (file)
--- a/PWG1/libPWG1.pkg
+++ b/PWG1/libPWG1.pkg
@@ -1,7 +1,10 @@
 
 SRCS:=         AliTreeDraw.cxx \
        AliGenInfo.cxx  AliGenInfoMaker.cxx  \
-       AliRecInfo.cxx  AliRecInfoMaker.cxx  \
+       AliESDRecInfo.cxx  \
+       AliESDRecV0Info.cxx  \
+       AliESDRecKinkInfo.cxx  \
+       AliRecInfoMaker.cxx  \
        AliComparisonDraw.cxx
 HDRS:= $(SRCS:.cxx=.h)