Reconstructor for digits and fix of some bugs

[u/mrichter/AliRoot.git] / ANALYSIS / AliAnalysisTaskMCParticleFilter.cxx

diff --git a/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx b/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx
index d14a7b9ead93f0a593ccd0764b4fd986eaceefdb..82849a73a96c5766f9f46b836ac45510aee7b01f 100644 (file)
--- a/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx
+++ b/ANALYSIS/AliAnalysisTaskMCParticleFilter.cxx
@@ -35,6 +35,7 @@
 #include "AliStack.h"
 #include "AliMCEvent.h"
 #include "AliMCEventHandler.h"
+#include "AliESDInputHandler.h"
 #include "AliAODEvent.h"
 #include "AliAODHeader.h"
 #include "AliAODMCHeader.h"
@@ -46,6 +47,11 @@
 #include "AliGenHijingEventHeader.h"
 #include "AliGenPythiaEventHeader.h"
 #include "AliGenCocktailEventHeader.h"
+#include "AliGenEventHeaderTunedPbPb.h"
+#include "AliESDtrack.h"
+#include "AliAODTrack.h"
+#include "AliAODPid.h"
+#include "AliESDpid.h"
 
 #include "AliLog.h"
 
@@ -70,7 +76,8 @@ Bool_t AliAnalysisTaskMCParticleFilter::Notify()
   // Implemented Notify() to read the cross sections
   // from pyxsec.root
   // 
-  TTree *tree = AliAnalysisManager::GetAnalysisManager()->GetTree();
+  AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
+  TTree *tree = mgr->GetTree();
   Double_t xsection = 0;
   UInt_t   ntrials  = 0;
   if(tree){
@@ -81,7 +88,11 @@ Bool_t AliAnalysisTaskMCParticleFilter::Notify()
     }
 
     TString fileName(curfile->GetName());
-    if(fileName.Contains("AliESDs.root")){
+    TString datafile = mgr->GetInputEventHandler()->GetInputFileName();
+    if (fileName.Contains(datafile)) {
+        fileName.ReplaceAll(datafile, "pyxsec.root");
+    }
+    else if(fileName.Contains("AliESDs.root")){
         fileName.ReplaceAll("AliESDs.root", "pyxsec.root");
     }
     else if(fileName.Contains("AliAOD.root")){
@@ -164,7 +175,7 @@ AliAnalysisTaskMCParticleFilter& AliAnalysisTaskMCParticleFilter::operator=(cons
 void AliAnalysisTaskMCParticleFilter::UserCreateOutputObjects()
 {
   // Create the output container
-  PostData(1,fHistList);
+  
 
     if (OutputTree()&&fTrackFilterMother) 
        OutputTree()->GetUserInfo()->Add(fTrackFilterMother);
@@ -212,17 +223,19 @@ void AliAnalysisTaskMCParticleFilter::UserCreateOutputObjects()
     h1Trials->GetXaxis()->SetBinLabel(1,"#sum{ntrials}");
     fHistList->Add(h1Trials);
 
+    PostData(1,fHistList);
     
 }
 
 //____________________________________________________________________
 void AliAnalysisTaskMCParticleFilter::UserExec(Option_t */*option*/)
 {
-// Execute analysis for current event
-//
-
-// Fill AOD tracks from Kinematic stack
-    
+  // Execute analysis for current event
+  //
+  
+  // Fill AOD tracks from Kinematic stack
+  PostData(1,fHistList);
+  
   // get AliAOD Event 
   AliAODEvent* aod = AODEvent();
   if (!aod) {
@@ -269,12 +282,17 @@ void AliAnalysisTaskMCParticleFilter::UserExec(Option_t */*option*/)
   AliGenHijingEventHeader *hiH  = 0;
   AliCollisionGeometry    *colG = 0;
   AliGenDPMjetEventHeader *dpmH = 0;
+  AliGenEventHeaderTunedPbPb *tunedH = 0;
+
   // it can be only one save some casts
   // assuming PYTHIA and HIJING are the most likely ones...
   if(!pyH){
       hiH = dynamic_cast<AliGenHijingEventHeader*>(mcEH);
       if(!hiH){
          dpmH = dynamic_cast<AliGenDPMjetEventHeader*>(mcEH);
+         if(!dpmH){
+           tunedH = dynamic_cast<AliGenEventHeaderTunedPbPb*>(mcEH);
+         }
       }
   }
   
@@ -311,8 +329,10 @@ void AliAnalysisTaskMCParticleFilter::UserExec(Option_t */*option*/)
     fAODMcHeader->SetReactionPlaneAngle(colG->ReactionPlaneAngle());
     AliInfo(Form("Found Collision Geometry. Got Reaction Plane %lf\n", colG->ReactionPlaneAngle()));
   }
-
-
+  else if(tunedH) {
+    fAODMcHeader->SetReactionPlaneAngle(tunedH->GetPsi2());
+    fAODMcHeader->SetCrossSection(tunedH->GetCentrality());
+  }
 
 
   Int_t j=0;
@@ -334,7 +354,7 @@ void AliAnalysisTaskMCParticleFilter::UserExec(Option_t */*option*/)
       // Check that the decay chain ends at a primary particle
       AliMCParticle* mother = mcpart;
       Int_t imo = mcpart->GetMother();
-      while((imo >= nprim) && (mother->GetUniqueID() == kPDecay)) {
+      while((imo >= nprim) && (mother->Particle()->GetUniqueID() == kPDecay)) {
        mother =  (AliMCParticle*) mcE->GetTrack(imo);
        imo =  mother->GetMother();
       }
@@ -351,7 +371,7 @@ void AliAnalysisTaskMCParticleFilter::UserExec(Option_t */*option*/)
        // Check if the gamma comes from the decay chain of a primary particle
        AliMCParticle* mother =  (AliMCParticle*) mcE->GetTrack(imo);
        imo = mother->GetMother();
-       while((imo >= nprim) && (mother->GetUniqueID() == kPDecay)) {
+       while((imo >= nprim) && (mother->Particle()->GetUniqueID() == kPDecay)) {
          mother =   (AliMCParticle*) mcE->GetTrack(imo);
          imo =  mother->GetMother();
        }
@@ -403,7 +423,6 @@ void AliAnalysisTaskMCParticleFilter::UserExec(Option_t */*option*/)
 
 
   aodH->StoreMCParticles();
-  PostData(1,fHistList);
 
   return;
 }