New hook needed for fast mixing.

diff --git a/ANALYSIS/AliAnalysisManager.cxx b/ANALYSIS/AliAnalysisManager.cxx
index dde4e73689b5f7d9d4158197d81d9a92a40297af..12792f97ffd5971d5dfb3e73da0e0df03ac321cc 100644 (file)
--- a/ANALYSIS/AliAnalysisManager.cxx
+++ b/ANALYSIS/AliAnalysisManager.cxx
@@ -473,6 +473,9 @@ Bool_t AliAnalysisManager::Process(Long64_t entry)
    if (fMCtruthEventHandler) fMCtruthEventHandler->BeginEvent(entry);
    
    GetEntry(entry);
+
+   if (fInputEventHandler)   fInputEventHandler  ->GetEntry();
+
    ExecAnalysis();
    if (fDebug > 1) printf("<-AliAnalysisManager::Process()\n");
    return kTRUE;

diff --git a/STEER/AliAODHandler.h b/STEER/AliAODHandler.h
index 32230c0581be94a04cf1096c068adbb88336df0e..6448d6350b4bf857624fa1728f656869420ee58b 100644 (file)
--- a/STEER/AliAODHandler.h
+++ b/STEER/AliAODHandler.h
@@ -35,6 +35,8 @@ class AliAODHandler : public AliVEventHandler {
     virtual const char*  GetExtraOutputs() const;
     virtual Bool_t       Init(Option_t* option);
     virtual Bool_t       Init(TTree* /*tree*/, Option_t* /*option*/)  {return kTRUE;}
+    virtual Bool_t       GetEntry() {return kTRUE;}
+           
     virtual Bool_t       BeginEvent(Long64_t /*entry*/) {fFillAOD=kFALSE; return kTRUE;}
     virtual Bool_t       Notify() { return AliVEventHandler::Notify(); };
     virtual Bool_t       Notify(const char * /* path */) {return kTRUE;}

diff --git a/STEER/AliESDHandler.h b/STEER/AliESDHandler.h
index f64016e79dec7de59c2958c8d5d626ac25a09803..b846509be0579898bce9c87132c08249b9aa1a73 100644 (file)
--- a/STEER/AliESDHandler.h
+++ b/STEER/AliESDHandler.h
@@ -28,6 +28,7 @@ class AliESDHandler : public AliVEventHandler {
        virtual const char* GetOutputFileName(){return fFileName.Data();}
        virtual Bool_t Init(Option_t* option);
        virtual Bool_t Init(TTree* /*tree*/, Option_t* /*option*/)  {return kTRUE;}
+       virtual Bool_t GetEntry() {return kTRUE;}
        virtual Bool_t BeginEvent(Long64_t /*entry*/){fIsEventSelectedForFriends = kFALSE; return kTRUE;}
        virtual Bool_t Notify() {return AliVEventHandler::Notify(); };
        virtual Bool_t Notify(const char * /* path */) {return kTRUE;}

diff --git a/STEER/AliInputEventHandler.h b/STEER/AliInputEventHandler.h
index 891345dddff91ea862842edb5099e98409089d0b..5b6b7b0cbffe39ce607893ef7d8860c2c9f750d3 100644 (file)
--- a/STEER/AliInputEventHandler.h
+++ b/STEER/AliInputEventHandler.h
@@ -32,8 +32,9 @@ class AliInputEventHandler : public AliVEventHandler {
     virtual const char  *GetOutputFileName()                          {return 0;}
     virtual Bool_t       Init(Option_t* /*opt*/)                      {return kTRUE;}
     virtual Bool_t       Init(TTree* /*tree*/, Option_t* /*opt*/)     {return kTRUE;}
+    virtual Bool_t       GetEntry() {if(fMixingHandler) fMixingHandler->GetEntry(); return kTRUE;}
+    
     virtual Bool_t       BeginEvent(Long64_t /*entry*/)               {return kTRUE;}
-    virtual Bool_t       GetEntry()                                   {return kTRUE;}    
     virtual Bool_t       Notify() { return AliVEventHandler::Notify();}
     virtual Bool_t       Notify(const char */*path*/)                 {return kTRUE;}
     virtual Bool_t       FinishEvent()                                {return kTRUE;}        

diff --git a/STEER/AliMCEventHandler.h b/STEER/AliMCEventHandler.h
index b86f0bf736f9906e2d931b2dd8cbeb61950ee99e..0fd10ba859c2f2138f72a055c0e76463b5f2e8d3 100644 (file)
--- a/STEER/AliMCEventHandler.h
+++ b/STEER/AliMCEventHandler.h
@@ -47,6 +47,7 @@ public:
     virtual void         SetInputTree(TTree* /*tree*/) {;}
     virtual TString*     GetInputPath() const {return fPathName;}
     virtual Bool_t       Init(Option_t* opt);
+    virtual Bool_t       GetEntry() {return kTRUE;}
     virtual Bool_t       InitIO(Option_t* opt) {return Init(opt);};
     virtual Bool_t       Init(TTree* /*tree*/, Option_t* /*opt*/) {return kTRUE;}
     virtual Bool_t       BeginEvent(Long64_t entry);

diff --git a/STEER/AliVEventHandler.h b/STEER/AliVEventHandler.h
index d2fe57e8613aa3459279ad67549244a8b2204a20..b7db857905961216f272224afb359ce0c90f8a6e 100644 (file)
--- a/STEER/AliVEventHandler.h
+++ b/STEER/AliVEventHandler.h
@@ -35,6 +35,7 @@ class AliVEventHandler : public TNamed {
     virtual Bool_t       Init(Option_t* opt)              = 0;
     virtual Bool_t       Init(TTree* tree, Option_t* opt) = 0;
     virtual Bool_t       BeginEvent(Long64_t entry)       = 0;
+    virtual Bool_t       GetEntry()                       = 0;
     virtual Bool_t       Notify(const char *path)         = 0;
     virtual Bool_t       FinishEvent()                    = 0;
     virtual Bool_t       Terminate()                      = 0;