New cut and histograms for photon calculation efficiency

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
index 3712bef5165177e48d6c84d97103d8db8d996c51..c398ff97fd65af5cd60f9c83dabaf06811d972c6 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.cxx
@@ -184,6 +184,7 @@ AliAnalysisTaskGammaConvDalitzV1::AliAnalysisTaskGammaConvDalitzV1():
        hESDTrueMotherGGInvMassPt(NULL),
        hESDTrueConvGammaPt(NULL),
        hESDTrueConvGammaR(NULL),
+       hESDTrueConvGammaRMC(NULL),
        hESDTruePositronPt(NULL),
        hESDTrueElectronPt(NULL),
        hESDTrueSecConvGammaPt(NULL),
@@ -355,6 +356,7 @@ AliAnalysisTaskGammaConvDalitzV1::AliAnalysisTaskGammaConvDalitzV1( const char*
        hESDTrueMotherGGInvMassPt(NULL),
        hESDTrueConvGammaPt(NULL),
        hESDTrueConvGammaR(NULL),
+       hESDTrueConvGammaRMC(NULL),
        hESDTruePositronPt(NULL),
        hESDTrueElectronPt(NULL),
        hESDTrueSecConvGammaPt(NULL),
@@ -897,6 +899,7 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects()
                hESDEposEnegTruePhotonPsiPairDPhiPtCut       = new TH2F*[fnCuts];
                hESDEposEnegTrueJPsiInvMassPt                = new TH2F*[fnCuts];
                hESDTrueConvGammaR                           = new TH1F*[fnCuts];
+               hESDTrueConvGammaRMC                         = new TH1F*[fnCuts];
                }
                
                
@@ -1049,6 +1052,10 @@ void AliAnalysisTaskGammaConvDalitzV1::UserCreateOutputObjects()
                                
                                hESDTrueConvGammaR[iCut] = new TH1F("ESD_TrueConvGamma_R","ESD_TrueConvGamma_R",800,0,200);
                                fTrueList[iCut]->Add(hESDTrueConvGammaR[iCut]);
+                               
+                               hESDTrueConvGammaRMC[iCut] = new TH1F("ESD_TrueConvGamma_R_MC","ESD_TrueConvGamma_R_MC",800,0,200);
+                               fTrueList[iCut]->Add(hESDTrueConvGammaRMC[iCut]);
+                               
                        }
 
                        hESDTruePositronPt[iCut] = new TH1F("ESD_TruePositron_Pt","ESD_TruePositron_Pt",1000,0,25);
@@ -1516,7 +1523,10 @@ void AliAnalysisTaskGammaConvDalitzV1::ProcessTruePhotonCandidates(AliAODConvers
        if( labelGamma < MCStack->GetNprimary() ){
                if( fIsFromMBHeader ){
                        hESDTrueConvGammaPt[fiCut]->Fill(TruePhotonCandidate->Pt());
-                       if(fDoMesonQA) hESDTrueConvGammaR[fiCut]->Fill(TruePhotonCandidate->GetConversionRadius());
+                       if(fDoMesonQA){
+                         hESDTrueConvGammaR[fiCut]->Fill(TruePhotonCandidate->GetConversionRadius());                   
+                         hESDTrueConvGammaRMC[fiCut]->Fill( posDaughter->R() );
+                       }
                }
        } else {
                if( fIsFromMBHeader){

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h
index f023158cb2a3e41179bb9379d16b16921a4a5e9c..2f2a9cd606fa976e3765fc3eacdfafe200870ca0 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvDalitzV1.h
@@ -207,6 +207,7 @@ class AliAnalysisTaskGammaConvDalitzV1: public AliAnalysisTaskSE
                TH2F                                                                    **hESDTrueMotherGGInvMassPt;
                TH1F                                                                    **hESDTrueConvGammaPt;
                TH1F                                                                    **hESDTrueConvGammaR;
+               TH1F                                                                    **hESDTrueConvGammaRMC;
                TH1F                                                                    **hESDTruePositronPt;
                TH1F                                                                    **hESDTrueElectronPt;
                TH1F                                                                    **hESDTrueSecConvGammaPt;

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C
index 94494a4bc1e7c363c7b1fea4bbb4c59deef1d960..336f6d956f16feff51a9451b2d339fef0a360777 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvDalitzQAV1_pPb.C
@@ -72,9 +72,10 @@ void AddTask_GammaConvDalitzQAV1_pPb(  Int_t trainConfig = 1,
    
    if(trainConfig == 9 || trainConfig == 10 ){
    cutnumberPhoton = "160084001001500000000";   //Offline  V0 finder 
-   }
-   else {
-   cutnumberPhoton = "060084001001500000000";   //Online  V0 finder
+   } else if ( trainConfig == 54  ){   // Warning!!!   Those trains must run in stand-alone mode
+   cutnumberPhoton = "000700040000500000000";  
+   } else {
+   cutnumberPhoton = "060084001000500000000";   //Online  V0 finder //change         
    }
    
    TString ElecCuts      = "90005400000002000000";            //Electron Cuts
@@ -425,6 +426,14 @@ if( trainConfig == 1 ) {  // No eta shift |Y| < 0.8
                                             
         eventCutArray[0]="8000011"; photonCutArray[0] = "002093603007200000000"; ElecCutarray[0] = "90475400233202623700"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100  //Tracks 2011  + kAny  + New psi pair cut + New psi pair cut  fPsiPairCut = 0.60    fDeltaPhiCutMin = 0.0 fDeltaPhiCutMax = 0.12
 
+} else if( trainConfig == 53 ) {  
+  
+        eventCutArray[0]="8000011"; photonCutArray[0] = "002093603007200000000"; ElecCutarray[0] = "90475400233202623700"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100  //Tracks 2011  + kAny  + New psi pair cut + New psi pair cut  fPsiPairCut = 0.60    fDeltaPhiCutMin = 0.0 fDeltaPhiCutMax = 0.12
+
+} else if( trainConfig == 54 ) {
+  
+        eventCutArray[0]="8000011"; photonCutArray[0] = "000700040000500000000"; ElecCutarray[0] = "90475400233202623710"; MesonCutarray[0] = "01031035009000"; //standard cut Pi0 pPb 00-100  //Tracks 2011 + kAny    + new psiPair Cut    0.60, 0.0 0.12   + 0   cm < Rconv  < 180 cm   //open cuts
+       
 }
        
 
@@ -470,7 +479,7 @@ if( trainConfig == 1 ) {  // No eta shift |Y| < 0.8
 
          if (  ( trainConfig >= 1 && trainConfig <= 6 ) || trainConfig == 9  ||  trainConfig == 11  || trainConfig == 13 || trainConfig == 14 || trainConfig == 16 || trainConfig == 17 || trainConfig == 18 || trainConfig == 19 || trainConfig == 20 || trainConfig == 21 || trainConfig == 22 || trainConfig == 23 ||
                  trainConfig == 28 || trainConfig == 29 || trainConfig == 30 ||  trainConfig == 31  || trainConfig == 32 || trainConfig == 33 || trainConfig == 37 || trainConfig == 38 || trainConfig == 39 || trainConfig == 40 || trainConfig == 41 || trainConfig == 41 || trainConfig == 43 || trainConfig == 44 ||
-                 trainConfig == 45 || trainConfig == 46 || trainConfig == 47 ||  trainConfig == 48  || trainConfig == 49 || trainConfig == 50 || trainConfig == 51 || trainConfig == 52 ) {
+                 trainConfig == 45 || trainConfig == 46 || trainConfig == 47 ||  trainConfig == 48  || trainConfig == 49 || trainConfig == 50 || trainConfig == 51 || trainConfig == 52 || trainConfig == 54 ) {
            
            if (doWeighting){
              if (generatorName.CompareTo("DPMJET")==0){