Merge branch 'master' of https://git.cern.ch/reps/AliRoot

[u/mrichter/AliRoot.git] / PWGGA / GammaConv / AliAnalysisTaskGammaConvDalitzV1.cxx

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
index 83b56a6cfcc1366c3d6f2f617d2bdbf47cd2675a..3712bef5165177e48d6c84d97103d8db8d996c51 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
@@ -609,7 +609,7 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects()
                fESDList[iCut]->SetName(Form("%s_%s_%s_%s ESD histograms",cutstringEvent.Data(),cutstringGamma.Data(),cutstringElectron.Data(),cutstringMeson.Data()));
                fESDList[iCut]->SetOwner(kTRUE);
                
-               hNEvents[iCut] = new TH1I("NEvents","NEvents",9,-0.5,8.5);
+               hNEvents[iCut] = new TH1I("NEvents","NEvents",10,-0.5,9.5);
                hNEvents[iCut]->GetXaxis()->SetBinLabel(1,"Accepted");
                hNEvents[iCut]->GetXaxis()->SetBinLabel(2,"Centrality");
                hNEvents[iCut]->GetXaxis()->SetBinLabel(3,"Missing MC");
@@ -619,6 +619,7 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects()
                hNEvents[iCut]->GetXaxis()->SetBinLabel(7,"Pile-Up");
                hNEvents[iCut]->GetXaxis()->SetBinLabel(8,"no SDD");
                hNEvents[iCut]->GetXaxis()->SetBinLabel(9,"no V0AND");
+               hNEvents[iCut]->GetXaxis()->SetBinLabel(10,"EMCAL problem");
                fESDList[iCut]->Add(hNEvents[iCut]);
 
                if(fIsHeavyIon == 1 || fIsHeavyIon == 2) hNGoodESDTracks[iCut] = new TH1I("GoodESDTracks","GoodESDTracks",3000,0,3000);
@@ -1235,10 +1236,10 @@ void AliAnalysisTaskGammaConvDalitzV1::UserExec(Option_t *)
 
                Int_t eventNotAccepted =
                        ((AliConvEventCuts*)fCutEventArray->At(iCut))
-                       ->IsEventAcceptedByCut(fV0Reader->GetEventCuts(),fInputEvent,fMCEvent,fIsHeavyIon);
+                       ->IsEventAcceptedByCut(fV0Reader->GetEventCuts(),fInputEvent,fMCEvent,fIsHeavyIon,kFALSE);
                
                
-               //Int_t eventNotAccepted = ((AliConvEventCuts*)fCutGammaArray->At(iCut))->IsEventAcceptedByCut(fV0Reader->GetEventCuts(),fInputEvent,fMCEvent,fIsHeavyIon);
+               //Int_t eventNotAccepted = ((AliConvEventCuts*)fCutGammaArray->At(iCut))->IsEventAcceptedByCut(fV0Reader->GetEventCuts(),fInputEvent,fMCEvent,fIsHeavyIon,kFALSE);
                
                if(eventNotAccepted){
                        //                      cout << "event rejected due to wrong trigger: " <<eventNotAccepted << endl;
@@ -1515,7 +1516,7 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessTruePhotonCandidates(AliAODConvers
        if( labelGamma < MCStack->GetNprimary() ){
                if( fIsFromMBHeader ){
                        hESDTrueConvGammaPt[fiCut]->Fill(TruePhotonCandidate->Pt());
-                       hESDTrueConvGammaR[fiCut]->Fill(TruePhotonCandidate->GetConversionRadius());
+                       if(fDoMesonQA) hESDTrueConvGammaR[fiCut]->Fill(TruePhotonCandidate->GetConversionRadius());
                }
        } else {
                if( fIsFromMBHeader){