Some fixes to make the test task work again within HLT

diff --git a/STEER/STEER/AliHLTTestInputHandler.cxx b/STEER/STEER/AliHLTTestInputHandler.cxx
index ff46f9eb3b6aefd8bec6820c2e4aeb36a488b948..576d79d803b18810fa41a68cb35e919f96679501 100644 (file)
--- a/STEER/STEER/AliHLTTestInputHandler.cxx
+++ b/STEER/STEER/AliHLTTestInputHandler.cxx
@@ -64,7 +64,7 @@ Bool_t AliHLTTestInputHandler::InitTaskInputData(AliVEvent* esdEvent, AliVfriend
   SetVFriendEvent(friendEvent);
   // set transient pointer to event inside tracks
   fEvent->ConnectTracks();
-  Printf("----> AliHLTTestInputHandler::InitTaskInpuData: ...Event set");
+  Printf("----> AliHLTTestInputHandler::InitTaskInpuData: ...Event set: fEvent = %p", fEvent);
   for (Int_t i = 0; i < arrTasks->GetEntries(); i++){
     AliAnalysisTask* t = (AliAnalysisTask*)(arrTasks->At(i));
     t->ConnectInputData("");

diff --git a/STEER/STEER/AliHLTTestInputHandler.h b/STEER/STEER/AliHLTTestInputHandler.h
index 8a091885bda6df0275aab41a4a00b78da049b29b..456ff339409c2176ecd524eedad8fb3412c1d708 100644 (file)
--- a/STEER/STEER/AliHLTTestInputHandler.h
+++ b/STEER/STEER/AliHLTTestInputHandler.h
@@ -38,9 +38,10 @@ class AliHLTTestInputHandler : public AliVEventHandler {
     virtual Bool_t TerminateIO() {return kTRUE;}
 
     // Especially needed for HLT
-    Bool_t InitTaskInputData(AliVEvent* /*esdEvent*/, AliVfriendEvent* /*friendEvent*/, TObjArray* /*arrTasks*/);
+    virtual Bool_t InitTaskInputData(AliVEvent* /*esdEvent*/, AliVfriendEvent* /*friendEvent*/, TObjArray* /*arrTasks*/);
 
-    AliVEvent* GetEvent() const {return NULL;}
+    AliVEvent* GetEvent() const {return fEvent;}
+    //AliVEvent* GetEvent() const {return NULL;}
     void  SetEvent(AliVEvent *event) {fEvent = event;}
 
     AliVfriendEvent* GetVFriendEvent() const {return fFriendEvent;}

diff --git a/TPC/Calib/AliAnalysisTaskPt.cxx b/TPC/Calib/AliAnalysisTaskPt.cxx
index 41d2d6667ecfb17c43366e64edec732897ecbe78..3f51dc770bb18de604b33bc3913ca27952b86d69 100644 (file)
--- a/TPC/Calib/AliAnalysisTaskPt.cxx
+++ b/TPC/Calib/AliAnalysisTaskPt.cxx
@@ -8,6 +8,7 @@
 #include "AliAnalysisManager.h"
 
 #include "AliESDEvent.h"
+//#include "AliFlatESDEvent.h"
 #include "AliESDtrackCuts.h"
 #include "AliVEventHandler.h"
 #include "AliTPCseed.h"
@@ -55,12 +56,15 @@ void AliAnalysisTaskPt::ConnectInputData(Option_t *)
     */
 
     AliVEventHandler *esdH = AliAnalysisManager::GetAnalysisManager()->GetInputEventHandler();
+    TString classInputHandler = esdH->ClassName();
+
+    Printf("----> AliAnalysisTaskPt: ClassName of handler = %s", classInputHandler.Data());
 
     if (!esdH) {
       Printf("ERROR: Could not get ESDInputHandler");
     } else {
       Printf("----> AliAnalysisTaskPt::ConnectInputData Getting the event from handler %p", esdH);
-      //fESD = dynamic_cast<AliESDEvent*>(esdH->GetEvent());
+      //fESD = dynamic_cast<AliFlatESDEvent*>(esdH->GetEvent());
       fESD = esdH->GetEvent();
       if (fUseFriends){        
        fESDfriend = esdH->GetVFriendEvent();