Added loop for extraction of clusters really attached to its track.

[u/mrichter/AliRoot.git] / ANALYSIS / AliEventPoolOTF.cxx

diff --git a/ANALYSIS/AliEventPoolOTF.cxx b/ANALYSIS/AliEventPoolOTF.cxx
index 22fca8fc74942a8e40d9e5b388ba46198f7b4391..7b8ab6af35ee671ade6ce57f94e06bf5133e2982 100644 (file)
--- a/ANALYSIS/AliEventPoolOTF.cxx
+++ b/ANALYSIS/AliEventPoolOTF.cxx
@@ -30,6 +30,7 @@
 #include "AliTagAnalysis.h"
 
 #include <TMath.h>
+#include <TChain.h>
 #include <TGridResult.h>
 
 ClassImp(AliEventPoolOTF)
@@ -45,6 +46,7 @@ AliEventPoolOTF::AliEventPoolOTF():
     fDetectorCuts(0),
     fEventCuts(0),
     fGridTags(0),
+    fChain(0),
     fTagDirectory(0),
     fValueMin(),
     fValueMax(),
@@ -66,6 +68,7 @@ AliEventPoolOTF::AliEventPoolOTF(const char* name, const char* title):
     fDetectorCuts(new AliDetectorTagCuts()),
     fEventCuts(new AliEventTagCuts()),
     fGridTags(0),
+    fChain(0),
     fTagDirectory("."),
     fValueMin(),
     fValueMax(),
@@ -88,6 +91,7 @@ AliEventPoolOTF::AliEventPoolOTF(const AliEventPoolOTF& obj):
     fDetectorCuts(0),
     fEventCuts(0),
     fGridTags(0),
+    fChain(0),
     fTagDirectory(0),
     fValueMin(),
     fValueMax(),
@@ -100,6 +104,18 @@ AliEventPoolOTF::AliEventPoolOTF(const AliEventPoolOTF& obj):
     InitArrays();
 }
 
+
+AliEventPoolOTF::~AliEventPoolOTF()
+{
+    // Destructor
+    delete fTagAnalysis;
+    delete fRunCuts;
+    delete fEventCuts;
+    delete fLHCCuts;
+    delete fDetectorCuts;
+    delete fChain;
+}
+
 AliEventPoolOTF& AliEventPoolOTF::operator=(const AliEventPoolOTF& other)
 {
 // Assignment operator
@@ -110,7 +126,7 @@ AliEventPoolOTF& AliEventPoolOTF::operator=(const AliEventPoolOTF& other)
 
 void AliEventPoolOTF::Init()
 {
-    //
+    // Initialisation
     if (!fGridTags) {
        fTagAnalysis->ChainLocalTags(fTagDirectory);
     } else {
@@ -118,30 +134,41 @@ void AliEventPoolOTF::Init()
     }
     
     
-    for (Int_t i = 0; i < 4; i++) fValue[i] = fValueMin[i];    
+    for (Int_t i = 0; i < 5; i++) fValue[i] = fValueMin[i];    
 }
 
 TChain* AliEventPoolOTF::GetNextChain()
 {
-    //
-    TChain* chain = 0;
+    // Get Next Chain
+    if (fChain) {
+       delete fChain;
+       fChain = 0;
+    }
+
     fBinNumber++;
     if (fNoMore) {
-       return 0;
+       return 0;
     } else {
-       printf("Current bin (lower) %13.3f %13.3f %13.3f \n", fValue[kMultiplicity], fValue[kZVertex], fValue[kEventPlane]);
-       printf("Current bin (upper) %13.3f %13.3f %13.3f \n", fValue[kMultiplicity] + fValueStep[kMultiplicity], 
-                                                             fValue[kZVertex]      + fValueStep[kZVertex], 
-                                                             fValue[kEventPlane]   + fValueStep[kEventPlane]);
-       
-       fEventCuts->SetMultiplicityRange(Int_t(fValue[kMultiplicity]) , Int_t(fValue[kMultiplicity] + fValueStep[kMultiplicity]));
+    printf("Current bin (lower) %13.3f %13.3f %13.3f %13.3f %13.3f \n", fValue[kMultiplicity], fValue[kZVertex], fValue[kEventPlane],fValue[kLeadingParticleEta],fValue[kLeadingParticlePhi]);
+    printf("Current bin (upper) %13.3f %13.3f %13.3f %13.3f %13.3f \n", fValue[kMultiplicity] + fValueStep[kMultiplicity] - 1, 
+          fValue[kZVertex]      + fValueStep[kZVertex], 
+          fValue[kEventPlane]   + fValueStep[kEventPlane],
+          fValue[kLeadingParticleEta]   + fValueStep[kLeadingParticleEta],
+           fValue[kLeadingParticlePhi]   + fValueStep[kLeadingParticlePhi]
+    
+          );
+
+       fEventCuts->SetMultiplicityRange(Int_t(fValue[kMultiplicity]) , Int_t(fValue[kMultiplicity] + fValueStep[kMultiplicity] - 1));
        fEventCuts->SetPrimaryVertexZRange(fValue[kZVertex] , fValue[kZVertex] + fValueStep[kZVertex]);
-       fEventCuts->SetEventPlaneAngleRange(fValue[kEventPlane] , fValue[kEventPlane] + fValueStep[kEventPlane]);
-       chain = fTagAnalysis->QueryTags(fRunCuts, fLHCCuts, fDetectorCuts, fEventCuts);
+        fEventCuts->SetEtaLeadingParticleRange(fValue[kLeadingParticleEta] , fValue[kLeadingParticleEta] + fValueStep[kLeadingParticleEta]);
+        fEventCuts->SetPhiLeadingParticleRange(fValue[kLeadingParticlePhi] , fValue[kLeadingParticlePhi] + fValueStep[kLeadingParticlePhi]);
+        fEventCuts->SetEventPlaneAngleRange(fValue[kEventPlane] , fValue[kEventPlane] + fValueStep[kEventPlane]);
+    
+       fChain = fTagAnalysis->QueryTags(fRunCuts, fLHCCuts, fDetectorCuts, fEventCuts);
 //
 //      Next bin 
 //
-       for (Int_t i = 2; i >= 0; i--) 
+       for (Int_t i = 5; i >= 0; i--) 
        {
            fValue[i] += fValueStep[i];
            if (i > 0  && fValue[i] >= fValueMax[i]) {
@@ -152,7 +179,7 @@ TChain* AliEventPoolOTF::GetNextChain()
                break;
            }
        }
-       return chain;
+       return fChain;
     }
 }
 
@@ -164,7 +191,7 @@ void  AliEventPoolOTF::GetCurrentBin(Float_t* /*bin*/)
 Int_t AliEventPoolOTF::GetDimension()
 {
     //
-    return (3);
+    return (5);
 }
 
 void AliEventPoolOTF::InitArrays()
@@ -174,8 +201,9 @@ void AliEventPoolOTF::InitArrays()
     SetMultiplicityBinning(0, 20000, 20000);
     SetZVertexBinning(-1000., 1000., 2000.);
     SetEventPlaneBinning(-1000., 1000., 2000.);
-    SetLeadingParticleEtaBinning(-1.0, 1.0, 2.);    
-    for (Int_t i = 0; i < 4; i++) fValue[i] = fValueMin[i];
+    SetLeadingParticleEtaBinning(-13.0, 13.0, 27.);
+    SetLeadingParticlePhiBinning(0., 2*(TMath::Pi()),2*(TMath::Pi()));
+    for (Int_t i = 0; i < 5; i++) fValue[i] = fValueMin[i];
 }