Added container for the list pool with events with tracks used for mixing

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
index 373c913a8a807d7cdaa1fa4c1ae22e30ee2fd348..d2899537fcb29c1b715a056f5a6a5fc651bcd04f 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.cxx
@@ -82,6 +82,8 @@ fEventTriggerMask(0),        fEventTriggerAtSE(0),
 fAnaLED(kFALSE),
 fTaskName(""),               fCaloUtils(0x0), 
 fMixedEvent(NULL),           fNMixedEvent(0),                 fVertex(NULL), 
+fListMixedTracksEvents(),    //fListMixedPhotonsEvents(),
+fLastMixedTracksEvent(-1),   //fLastMixedPhotonsEvent(-1),
 fWriteOutputDeltaAOD(kFALSE),fOldAOD(kFALSE),                 fCaloFilterPatch(kFALSE),
 fEMCALClustersListName(""),  fZvtxCut(0.),                    
 fAcceptFastCluster(kFALSE),  fRemoveLEDEvents(kTRUE), 

diff --git a/PWG/CaloTrackCorrBase/AliCaloTrackReader.h b/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
index 89072c3ad967fbbae23fdab7bb46febeb056bf97..a9481c187a266934f3404bad687ecea7cf06ba5b 100755 (executable)
--- a/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
+++ b/PWG/CaloTrackCorrBase/AliCaloTrackReader.h
@@ -290,6 +290,35 @@ public:
   virtual void           SetEventPlaneMethod(TString m)    { fEventPlaneMethod = m               ; }
   virtual TString        GetEventPlaneMethod()       const { return fEventPlaneMethod            ; }
 
+  //--------------------
+  // Mixing
+  //--------------------
+
+  //Int_t   GetLastPhotonsMixedEvent()                 const { return fLastMixedPhotonsEvent       ; }
+  Int_t   GetLastTracksMixedEvent ()                 const { return fLastMixedTracksEvent        ; }
+  
+  //TList * GetListWithMixedEventsForPhotons(Int_t bi) const { return fListMixedPhotonsEvents[bi]  ; }
+  TList * GetListWithMixedEventsForTracks (Int_t bi) const { return fListMixedTracksEvents [bi]  ; }  
+   
+  //Bool_t  ListWithMixedEventsForPhotonsExists()      const { 
+  //  if(fListMixedPhotonsEvents) return kTRUE  ;
+  //  else                        return kFALSE ; }
+
+  Bool_t  ListWithMixedEventsForTracksExists()       const { 
+    if(fListMixedTracksEvents) return kTRUE  ;
+    else                       return kFALSE ; }
+  
+  //void    SetLastPhotonsMixedEvent(Int_t e)                { fLastMixedPhotonsEvent = e          ; }
+  void    SetLastTracksMixedEvent (Int_t e)                { fLastMixedTracksEvent  = e          ; }
+  
+  //void    SetListWithMixedEventsForPhotons(TList ** l)     { 
+  //          if(fListMixedPhotonsEvents) printf("AliCaloTrackReader::SetListWithMixedEventsForPhotons() - Track Mixing event list already set, nothing done\n");
+  //          else                        fListMixedPhotonsEvents = l ; }
+  
+  void    SetListWithMixedEventsForTracks (TList ** l)     { 
+            if(fListMixedTracksEvents)  printf("AliCaloTrackReader::SetListWithMixedEventsForTracks() - Track Mixing event list already set, nothing done\n");
+            else                        fListMixedTracksEvents  = l ; }
+  
   //-------------------------------------
   // Other methods
   //-------------------------------------
@@ -420,6 +449,11 @@ public:
   Int_t            fNMixedEvent ;           // number of events in mixed event buffer
   Double_t      ** fVertex      ;           //! vertex array 3 dim for each mixed event buffer
   
+  TList **         fListMixedTracksEvents ; //! Container for tracks stored for different events, used in case of own mixing, set in analysis class
+  //TList **         fListMixedPhotonsEvents; //! Container for photon stored for different events, used in case of own mixing, set in analysis class
+  Int_t            fLastMixedTracksEvent  ; //  Temporary container with the last event added to the mixing list for tracks
+  //Int_t            fLastMixedPhotonsEvent ; //  Temporary container with the last event added to the mixing list for photons
+  
   Bool_t           fWriteOutputDeltaAOD;    // Write the created delta AOD objects into file  
        Bool_t           fOldAOD;                 // Old AODs, before revision 4.20
   
@@ -450,7 +484,7 @@ public:
   AliCaloTrackReader(              const AliCaloTrackReader & r) ; // cpy ctor
   AliCaloTrackReader & operator = (const AliCaloTrackReader & r) ; // cpy assignment
   
-  ClassDef(AliCaloTrackReader,39)
+  ClassDef(AliCaloTrackReader,40)
   
 } ;