Major dielectron framework update; includes "alignment" to updates in

[u/mrichter/AliRoot.git] / PWG3 / dielectron / AliAnalysisTaskMultiDielectron.cxx

diff --git a/PWG3/dielectron/AliAnalysisTaskMultiDielectron.cxx b/PWG3/dielectron/AliAnalysisTaskMultiDielectron.cxx
index 2638679ca567ff34493b2566adc7d1553d49227e..2c712fecdb7e8ddeb5777ccd8e2dd5ccb8bb035b 100644 (file)
--- a/PWG3/dielectron/AliAnalysisTaskMultiDielectron.cxx
+++ b/PWG3/dielectron/AliAnalysisTaskMultiDielectron.cxx
@@ -25,7 +25,7 @@
 #include <AliCFContainer.h>
 #include <AliInputEventHandler.h>
 #include <AliESDInputHandler.h>
-#include <AliAODHandler.h>
+#include <AliAODInputHandler.h>
 #include <AliAnalysisManager.h>
 #include <AliVEvent.h>
 #include <AliTriggerAnalysis.h>
@@ -97,7 +97,7 @@ void AliAnalysisTaskMultiDielectron::UserCreateOutputObjects()
 
   AliAnalysisManager *man=AliAnalysisManager::GetAnalysisManager();
   Bool_t isESD=man->GetInputEventHandler()->IsA()==AliESDInputHandler::Class();
-//   Bool_t isAOD=man->GetInputEventHandler()->IsA()==AliAODHandler::Class();
+//   Bool_t isAOD=man->GetInputEventHandler()->IsA()==AliAODInputHandler::Class();
   
   TIter nextDie(&fListDielectron);
   AliDielectron *die=0;
@@ -144,7 +144,7 @@ void AliAnalysisTaskMultiDielectron::UserExec(Option_t *)
   AliAnalysisManager *man=AliAnalysisManager::GetAnalysisManager();
   AliESDInputHandler *esdHandler=0x0;
   Bool_t isESD=man->GetInputEventHandler()->IsA()==AliESDInputHandler::Class();
-  Bool_t isAOD=man->GetInputEventHandler()->IsA()==AliAODHandler::Class();
+  Bool_t isAOD=man->GetInputEventHandler()->IsA()==AliAODInputHandler::Class();
   if ( (esdHandler=dynamic_cast<AliESDInputHandler*>(man->GetInputEventHandler())) && esdHandler->GetESDpid() ){
     AliDielectronVarManager::SetESDpid(esdHandler->GetESDpid());
   } else {
@@ -223,8 +223,8 @@ void AliAnalysisTaskMultiDielectron::UserExec(Option_t *)
     die->Process(InputEvent());
     if (die->HasCandidates()){
       Int_t ncandidates=die->GetPairArray(1)->GetEntriesFast();
-      if (ncandidates==1) fEventStat->Fill((kNbinsEvent+1)+2*idie);
-      else if (ncandidates>1) fEventStat->Fill((kNbinsEvent+2)+2*idie);
+      if (ncandidates==1) fEventStat->Fill((kNbinsEvent)+2*idie);
+      else if (ncandidates>1) fEventStat->Fill((kNbinsEvent+1)+2*idie);
     }
     ++idie;
   }