counter for merged objects added

diff --git a/PWGCF/Correlations/Base/AliUEHistograms.cxx b/PWGCF/Correlations/Base/AliUEHistograms.cxx
index 1b4f4e311a4ead38ea56a44067ab1def9df2ec44..a2eb16eaf1173daa1311995cffb554888155567a 100644 (file)
--- a/PWGCF/Correlations/Base/AliUEHistograms.cxx
+++ b/PWGCF/Correlations/Base/AliUEHistograms.cxx
@@ -64,7 +64,8 @@ AliUEHistograms::AliUEHistograms(const char* name, const char* histograms) :
   fCutConversions(kFALSE),
   fCutResonances(kFALSE),
   fOnlyOneEtaSide(0),
-  fRunNumber(0)
+  fRunNumber(0),
+  fMergeCount(1)
 {
   // Constructor
   //
@@ -176,7 +177,8 @@ AliUEHistograms::AliUEHistograms(const AliUEHistograms &c) :
   fCutConversions(kFALSE),
   fCutResonances(kFALSE),
   fOnlyOneEtaSide(0),
-  fRunNumber(0)
+  fRunNumber(0),
+  fMergeCount(1)
 {
   //
   // AliUEHistograms copy constructor
@@ -853,6 +855,7 @@ void AliUEHistograms::Copy(TObject& c) const
   target.fCutResonances = fCutResonances;
   target.fOnlyOneEtaSide = fOnlyOneEtaSide;
   target.fRunNumber = fRunNumber;
+  target.fMergeCount = fMergeCount;
 }
 
 //____________________________________________________________________
@@ -910,6 +913,9 @@ Long64_t AliUEHistograms::Merge(TCollection* list)
       lists[16]->Add(entry->fCentralityCorrelation);
     if (entry->fYields)
       lists[17]->Add(entry->fYields);
+
+    fMergeCount += entry->fMergeCount;
+
     count++;
   }
     
@@ -941,7 +947,7 @@ Long64_t AliUEHistograms::Merge(TCollection* list)
   
   for (Int_t i=0; i<kMaxLists; i++)
     delete lists[i];
-
+  
   return count+1;
 }
 

diff --git a/PWGCF/Correlations/Base/AliUEHistograms.h b/PWGCF/Correlations/Base/AliUEHistograms.h
index 1623efc0055c57c9a263d80b69f13f2e673b8810..a7ee286471c82eb6f3ec92ad2b5895eeddec11d0 100644 (file)
--- a/PWGCF/Correlations/Base/AliUEHistograms.h
+++ b/PWGCF/Correlations/Base/AliUEHistograms.h
@@ -61,6 +61,7 @@ class AliUEHistograms : public TNamed
   TH1F* GetVertexContributors() { return fVertexContributors; }
   TH1F* GetCentralityDistribution() { return fCentralityDistribution; }
   Long64_t GetRunNumber() { return fRunNumber; }
+  Int_t GetMergeCount() { return fMergeCount; }
   TH3F* GetTwoTrackDistance(Int_t i) { return fTwoTrackDistancePt[i]; }
   
   void Correct(AliUEHistograms* corrections);
@@ -129,7 +130,9 @@ protected:
   
   Long64_t fRunNumber;           // run number that has been processed
   
-  ClassDef(AliUEHistograms, 16)  // underlying event histogram container
+  Int_t fMergeCount;           // counts how many objects have been merged together
+  
+  ClassDef(AliUEHistograms, 17)  // underlying event histogram container
 };
 
 Float_t AliUEHistograms::GetDPhiStar(Float_t phi1, Float_t pt1, Float_t charge1, Float_t phi2, Float_t pt2, Float_t charge2, Float_t radius, Float_t bSign)