Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGLF / SPECTRA / PiKaPr / TestAOD / AliAnalysisTaskSpectraBoth.cxx

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx
index e9888440ca1eecae9b323dd1c73908b02298ed48..af9348a0d5cb7ab376fe5d81b5befd337c144302 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskSpectraBoth.cxx
@@ -113,8 +113,16 @@ void AliAnalysisTaskSpectraBoth::UserExec(Option_t *)
        }
        else
                AliFatal("Not processing AODs or ESDS") ;
+       if(fIsMC)
+       {               
+               if(!fEventCuts->CheckMCProcessType(MCEvent()))
+                       return ;                
+       }
+
+
        if(fdotheMCLoopAfterEventCuts)
-               if(!fEventCuts->IsSelected(fAOD,fTrackCuts))return;//event selection
+               if(!fEventCuts->IsSelected(fAOD,fTrackCuts,fIsMC,-100,fHistMan->GetEventStatHist()))
+                       return;//event selection
        TClonesArray *arrayMC = 0;
        Int_t npar=0;
        AliStack* stack=0x0;
@@ -205,7 +213,8 @@ void AliAnalysisTaskSpectraBoth::UserExec(Option_t *)
                  }
        }
        if(!fdotheMCLoopAfterEventCuts)
-               if(!fEventCuts->IsSelected(fAOD,fTrackCuts,fIsMC,mcZ))return;//event selection
+               if(!fEventCuts->IsSelected(fAOD,fTrackCuts,fIsMC,mcZ,fHistMan->GetEventStatHist()))
+                       return;//event selection
        //main loop on tracks
        Int_t ntracks=0;
        //cout<<fAOD->GetNumberOfTracks()<<endl;
@@ -245,7 +254,8 @@ void AliAnalysisTaskSpectraBoth::UserExec(Option_t *)
                else
                        continue;
                if (!fTrackCuts->IsSelected(track,kTRUE)) 
-                       continue;
+                       continue;       
+                       
                ntracks++;
                if(fmakePIDQAhisto)
                        fPID->FillQAHistos(fHistMan, track, fTrackCuts);
@@ -290,9 +300,12 @@ void AliAnalysisTaskSpectraBoth::UserExec(Option_t *)
                        if(idRec != kSpUndefined && fTrackCuts->CheckYCut ((BothParticleSpecies_t)idRec))
                        {
                                fHistMan->GetHistogram2D(kHistPtRecSigma,idRec,charge)->Fill(track->Pt(),dca);
-                               fTrackCuts->GetHistoDCAzQA()->Fill(idRec,track->Pt(),dcaz);
-                               fTrackCuts->GetHistoNclustersQA()->Fill(idRec,track->Pt(),ncls);
-                               fTrackCuts->GetHistochi2perNDFQA()->Fill(idRec,track->Pt(),chi2perndf);
+                               if(fTrackCuts->GetMakeQAhisto())
+                               { 
+                                       fTrackCuts->GetHistoDCAzQA()->Fill(idRec,track->Pt(),dcaz);
+                                       fTrackCuts->GetHistoNclustersQA()->Fill(idRec,track->Pt(),ncls);
+                                       fTrackCuts->GetHistochi2perNDFQA()->Fill(idRec,track->Pt(),chi2perndf);
+                               }
                                sel[idRec]=true;
                        }
                        //can't put a continue because we still have to fill allcharged primaries, done later