X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ANALYSIS%2FAliEventPoolOTF.cxx;h=7b8ab6af35ee671ade6ce57f94e06bf5133e2982;hb=98a5e9e40a99184b1a7ec8a7ec5e387565a519cd;hp=90d759b6dfaaf3f840169767c0ad1f6e40f9bc43;hpb=a01e4203f6c689838eb7272e5130f75d6428c852;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ANALYSIS/AliEventPoolOTF.cxx b/ANALYSIS/AliEventPoolOTF.cxx
index 90d759b6dfa..7b8ab6af35e 100644
--- 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)
@@ -103,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
@@ -113,7 +126,7 @@ AliEventPoolOTF& AliEventPoolOTF::operator=(const AliEventPoolOTF& other)
 
 void AliEventPoolOTF::Init()
 {
-    //
+    // Initialisation
     if (!fGridTags) {
 	fTagAnalysis->ChainLocalTags(fTagDirectory);
     } else {
@@ -121,12 +134,12 @@ 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()
 {
-    //
+    // Get Next Chain
     if (fChain) {
 	delete fChain;
 	fChain = 0;
@@ -134,10 +147,10 @@ TChain* AliEventPoolOTF::GetNextChain()
 
     fBinNumber++;
     if (fNoMore) {
-	return 0;
+ 	return 0;
     } else {
     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], 
+    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],
@@ -145,7 +158,7 @@ TChain* AliEventPoolOTF::GetNextChain()
     
 	   );
 
-	fEventCuts->SetMultiplicityRange(Int_t(fValue[kMultiplicity]) , Int_t(fValue[kMultiplicity] + fValueStep[kMultiplicity]));
+	fEventCuts->SetMultiplicityRange(Int_t(fValue[kMultiplicity]) , Int_t(fValue[kMultiplicity] + fValueStep[kMultiplicity] - 1));
 	fEventCuts->SetPrimaryVertexZRange(fValue[kZVertex] , fValue[kZVertex] + fValueStep[kZVertex]);
         fEventCuts->SetEtaLeadingParticleRange(fValue[kLeadingParticleEta] , fValue[kLeadingParticleEta] + fValueStep[kLeadingParticleEta]);
         fEventCuts->SetPhiLeadingParticleRange(fValue[kLeadingParticlePhi] , fValue[kLeadingParticlePhi] + fValueStep[kLeadingParticlePhi]);
@@ -188,10 +201,9 @@ void AliEventPoolOTF::InitArrays()
     SetMultiplicityBinning(0, 20000, 20000);
     SetZVertexBinning(-1000., 1000., 2000.);
     SetEventPlaneBinning(-1000., 1000., 2000.);
-    SetEventPlaneBinning(-1000., 1000., 2000.);
-    SetLeadingParticleEtaBinning(-13.0, 13.0, 26.); 
-    SetLeadingParticlePhiBinning(0, 2*(TMath::Pi()),2*(TMath::Pi()));   
-    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];
 }