fixed sig.segv

[u/mrichter/AliRoot.git] / PWG2 / RESONANCES / AliRsnVAnalysisTaskSE.cxx

diff --git a/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx b/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
index afc37f2d693d062f14143e7d58026da4d49bfd9a..6aa237ebd46834ddff36a12d29fbc159cbf10e29 100644 (file)
--- a/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
+++ b/PWG2/RESONANCES/AliRsnVAnalysisTaskSE.cxx
@@ -18,19 +18,18 @@ ClassImp(AliRsnVAnalysisTaskSE)
 
 //_____________________________________________________________________________
 AliRsnVAnalysisTaskSE::AliRsnVAnalysisTaskSE
-(const char *name, Int_t numOfOutputs, Bool_t mcOnly) :
-    AliAnalysisTaskSE(name),
-    fLogType(AliLog::kInfo),
-    fLogClassesString(""),
-    fESDEvent(0x0),
-    fMCEvent(0x0),
-    fAODEventIn(0x0),
-    fAODEventOut(0x0),
-    fMCOnly(mcOnly),
-    fRsnEvent(),
-    fRsnPIDIndex(),
-    fNumberOfOutputs(numOfOutputs),
-    fTaskInfo(name)
+(const char *name, Bool_t mcOnly) :
+  AliAnalysisTaskSE(name),
+  fLogType(AliLog::kInfo),
+  fLogClassesString(""),
+  fESDEvent(0x0),
+  fMCEvent(0x0),
+  fAODEventIn(0x0),
+  fAODEventOut(0x0),
+  fMCOnly(mcOnly),
+  fRsnEvent(),
+  fInfoList(0x0),
+  fTaskInfo(name)
 {
 //
 // Default constructor.
@@ -39,32 +38,25 @@ AliRsnVAnalysisTaskSE::AliRsnVAnalysisTaskSE
 
   AliDebug(AliLog::kDebug+2,"<-");
 
-  if (fNumberOfOutputs<0) fNumberOfOutputs = 0;
-  if (fNumberOfOutputs>kMaxNumberOfOutputs) {
-    AliWarning(Form("We support only %d outputs. If you need more ask for it.",kMaxNumberOfOutputs));
-    AliWarning(Form("For now we are setting it to %d.",kMaxNumberOfOutputs));
-    fNumberOfOutputs = kMaxNumberOfOutputs;
-  }
-
   DefineOutput(1, TList::Class());
+  DefineOutput(2, TList::Class());
 
   AliDebug(AliLog::kDebug+2,"->");
 }
 
 //_____________________________________________________________________________
 AliRsnVAnalysisTaskSE::AliRsnVAnalysisTaskSE(const AliRsnVAnalysisTaskSE& copy) :
-    AliAnalysisTaskSE(copy),
-    fLogType(copy.fLogType),
-    fLogClassesString(copy.fLogClassesString),
-    fESDEvent(copy.fESDEvent),
-    fMCEvent(copy.fMCEvent),
-    fAODEventIn(copy.fAODEventIn),
-    fAODEventOut(copy.fAODEventOut),
-    fMCOnly(copy.fMCOnly),
-    fRsnEvent(),
-    fRsnPIDIndex(),
-    fNumberOfOutputs(copy.fNumberOfOutputs),
-    fTaskInfo(copy.fTaskInfo)
+  AliAnalysisTaskSE(copy),
+  fLogType(copy.fLogType),
+  fLogClassesString(copy.fLogClassesString),
+  fESDEvent(copy.fESDEvent),
+  fMCEvent(copy.fMCEvent),
+  fAODEventIn(copy.fAODEventIn),
+  fAODEventOut(copy.fAODEventOut),
+  fMCOnly(copy.fMCOnly),
+  fRsnEvent(),
+  fInfoList(0x0),
+  fTaskInfo(copy.fTaskInfo)
 {
 //
 // Copy constructor.
@@ -91,7 +83,7 @@ void AliRsnVAnalysisTaskSE::LocalInit()
 }
 
 //_____________________________________________________________________________
-Bool_t AliRsnVAnalysisTaskSE::Notify()
+Bool_t AliRsnVAnalysisTaskSE::UserNotify()
 {
 //
 // Calls the mother class Notify()
@@ -100,7 +92,7 @@ Bool_t AliRsnVAnalysisTaskSE::Notify()
   AliDebug(AliLog::kDebug+2,"<-");
   AliDebug(AliLog::kDebug+2,"->");
 
-  return AliAnalysisTaskSE::Notify();
+  return AliAnalysisTaskSE::UserNotify();
 }
 
 //_____________________________________________________________________________
@@ -167,11 +159,13 @@ void AliRsnVAnalysisTaskSE::UserCreateOutputObjects()
 
   AliDebug(AliLog::kDebug+2, "<-");
 
-  fOutList[0] = new TList();
-  fOutList[0]->SetOwner();
-  fTaskInfo.GenerateInfoList(fOutList[0]);
+  fInfoList = new TList();
+  fInfoList->SetOwner();
+  fTaskInfo.GenerateInfoList(fInfoList);
   RsnUserCreateOutputObjects();
 
+  PostData(1, fInfoList);
+
   AliDebug(AliLog::kDebug+2,"<-");
 }
 
@@ -189,28 +183,37 @@ void AliRsnVAnalysisTaskSE::UserExec(Option_t* opt)
   // otherwise the AOD event is used;
   // if the MC information is available, it is linked
   if (fMCOnly && fMCEvent)
-    fRsnEvent.SetRef(fMCEvent, fMCEvent);
+  {
+    fRsnEvent.SetRef  (fMCEvent);
+    fRsnEvent.SetRefMC(fMCEvent);
+  }
   else if (fESDEvent)
-    fRsnEvent.SetRef(fESDEvent, fMCEvent);
+  {
+    fRsnEvent.SetRef  (fESDEvent);
+    fRsnEvent.SetRefMC(fMCEvent);
+  }
   else if (fAODEventOut)
-    fRsnEvent.SetRef(fAODEventOut);
+  {
+    fRsnEvent.SetRef  (fAODEventOut);
+    fRsnEvent.SetRefMC(fAODEventOut);
+  }
   else if (fAODEventIn)
-    fRsnEvent.SetRef(fAODEventIn);
+  {
+    fRsnEvent.SetRef  (fAODEventIn);
+    fRsnEvent.SetRefMC(fAODEventIn);
+  }
   else {
     AliError("NO ESD or AOD object!!! Skipping ...");
     return;
   }
 
-  // sort tracks w.r. to PID...
-  fRsnPIDIndex.FillFromEvent(&fRsnEvent);
-
   RsnUserExec(opt);
 
   FillInfo();
 
   fTaskInfo.PrintInfo(fTaskInfo.GetNumerOfEventsProcessed());
 
-  PostData(1, fOutList[0]);
+  PostData(1, fInfoList);
 
   AliDebug(AliLog::kDebug+2,"->");
 }
@@ -268,9 +271,9 @@ void AliRsnVAnalysisTaskSE::Terminate(Option_t* opt)
   }
 
   AliInfo(Form("=== %s ==================",GetName()));
-  AliInfo(Form("Number Of Events Processed : %10l",(Long64_t)hEventInfo->Integral()));
-  AliInfo(Form("Number Of Events Accepted  : %10l",(Long64_t)hEventInfo->GetBinContent(2)));
-  AliInfo(Form("Number Of Events Skipped   : %10l",(Long64_t)hEventInfo->GetBinContent(1)));
+  AliInfo(Form("Number Of Events Processed : %10lld",(Long64_t)hEventInfo->Integral()));
+  AliInfo(Form("Number Of Events Accepted  : %10lld",(Long64_t)hEventInfo->GetBinContent(2)));
+  AliInfo(Form("Number Of Events Skipped   : %10lld",(Long64_t)hEventInfo->GetBinContent(1)));
   AliInfo(Form("=== end %s ==============",GetName()));
 
   AliDebug(AliLog::kDebug+2, "->");
@@ -333,3 +336,4 @@ void AliRsnVAnalysisTaskSE::SetDebugForAllClasses()
   }
   AliDebug(AliLog::kDebug+2,"->");
 }
+