From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 29 Oct 2010 11:39:50 +0000 (+0000)
Subject: Updates for Mixing (M. Vala)
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=a37ff5af5e5b6fad2321d7498b3017c0c2976e20;p=u%2Fmrichter%2FAliRoot.git

Updates for Mixing (M. Vala)
---

diff --git a/STEER/AliESDInputHandler.cxx b/STEER/AliESDInputHandler.cxx
index 1fad1638263..8d9c1056951 100644
--- a/STEER/AliESDInputHandler.cxx
+++ b/STEER/AliESDInputHandler.cxx
@@ -194,7 +194,10 @@ Bool_t AliESDInputHandler::Notify(const char* path)
 	}
     }
 
-    if (!fUseTags) return (kTRUE);
+    if (!fUseTags) {
+	if (fMixingHandler) fMixingHandler->Notify(path);
+	return (kTRUE);
+    }
     
     Bool_t zip = kFALSE;
     
diff --git a/STEER/AliESDInputHandler.h b/STEER/AliESDInputHandler.h
index eb72a976f40..76cc6aa9b34 100644
--- a/STEER/AliESDInputHandler.h
+++ b/STEER/AliESDInputHandler.h
@@ -26,10 +26,10 @@ class AliESDInputHandler : public AliInputEventHandler {
     AliESDInputHandler();
     AliESDInputHandler(const char* name, const char* title);
     virtual ~AliESDInputHandler();
-    virtual Bool_t       Init(Option_t* /*opt*/) {return kTRUE;}
+    virtual Bool_t       Init(Option_t* opt) {return AliInputEventHandler::Notify(opt);}
     virtual Bool_t       Init(TTree* tree, Option_t* opt);
     virtual Bool_t       BeginEvent(Long64_t entry);
-    virtual Bool_t       Notify() { return AliVEventHandler::Notify(); };
+    virtual Bool_t       Notify() { return AliInputEventHandler::Notify(); };
     virtual Bool_t       Notify(const char* path);
     virtual Bool_t       FinishEvent();
     void                 CheckSelectionMask();
diff --git a/STEER/AliESDInputHandlerRP.cxx b/STEER/AliESDInputHandlerRP.cxx
index 1a504a6b640..6a9f9055d01 100644
--- a/STEER/AliESDInputHandlerRP.cxx
+++ b/STEER/AliESDInputHandlerRP.cxx
@@ -118,6 +118,9 @@ Bool_t AliESDInputHandlerRP::Init(Option_t* opt)
     fFileNumber       =  0;
     // Get number of events from esd tree 
     printf("AliESDInputHandlerRP::Init() %d %d\n",__LINE__, fNEvents);
+    //
+    AliESDInputHandler::Init(opt);
+    //
     return kTRUE;
 }
 
@@ -213,9 +216,11 @@ Bool_t AliESDInputHandlerRP::Notify(const char *path)
   // Notify about directory change
   // The directory is taken from the 'path' argument
   // 
-    AliInfo(Form("Directory change %s \n", path));
+
     // Get path to directory
     TString fileName(path);
+    if (fileName.IsNull()) return kFALSE;
+    AliInfo(Form("Directory change %s \n", path));
 
     if(fileName.Contains("#")){
     // If this is an archive it will contain a # 
diff --git a/STEER/AliESDInputHandlerRP.h b/STEER/AliESDInputHandlerRP.h
index 17c7a8b7582..f143e7f77cd 100644
--- a/STEER/AliESDInputHandlerRP.h
+++ b/STEER/AliESDInputHandlerRP.h
@@ -31,7 +31,7 @@ class AliESDInputHandlerRP : public AliESDInputHandler {
     virtual Bool_t       BeginEvent(Long64_t entry);
     virtual Bool_t       FinishEvent();
     virtual Bool_t       LoadEvent(Int_t iev);
-    virtual Bool_t       Notify() {return kTRUE;}
+    virtual Bool_t       Notify() { return AliESDInputHandler::Notify();}
     virtual Bool_t       Notify(const char* path);
     virtual void         ResetIO();
     //
diff --git a/STEER/AliInputEventHandler.h b/STEER/AliInputEventHandler.h
index 5b6b7b0cbff..95b4a7b41d6 100644
--- a/STEER/AliInputEventHandler.h
+++ b/STEER/AliInputEventHandler.h
@@ -30,16 +30,17 @@ class AliInputEventHandler : public AliVEventHandler {
     virtual ~AliInputEventHandler();
     virtual void         SetOutputFileName(const char* /*fname*/) {;}
     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       Init(Option_t* opt) {if(fMixingHandler) fMixingHandler->Init(opt);return kTRUE;}
+    virtual Bool_t       Init(TTree* tree, Option_t* opt) {if(fMixingHandler) fMixingHandler->Init(tree,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       Notify() { return AliVEventHandler::Notify();}
-    virtual Bool_t       Notify(const char */*path*/)                 {return kTRUE;}
-    virtual Bool_t       FinishEvent()                                {return kTRUE;}        
-    virtual Bool_t       Terminate()                                  {return kTRUE;}
-    virtual Bool_t       TerminateIO()                                {return kTRUE;}
+    virtual Bool_t       BeginEvent(Long64_t entry) {if(fMixingHandler) fMixingHandler->BeginEvent(entry);return kTRUE;}
+
+    virtual Bool_t       Notify()      { return AliVEventHandler::Notify();}
+    virtual Bool_t       Notify(const char *path) {if(fMixingHandler) fMixingHandler->Notify(path);return kTRUE;}
+    virtual Bool_t       FinishEvent() {if(fMixingHandler) fMixingHandler->FinishEvent();return kTRUE;}        
+    virtual Bool_t       Terminate()   {if(fMixingHandler) fMixingHandler->Terminate();return kTRUE;}
+    virtual Bool_t       TerminateIO() {if(fMixingHandler) fMixingHandler->TerminateIO();return kTRUE;}
+
     // Setters
     virtual void         SetInputTree(TTree* tree)                    {fTree = tree;}
     virtual void         SetEventSelection(AliVCuts* cuts)            {fEventCuts = cuts;}