changes in Conversion cuts correct bug for photon quality selection

diff --git a/PWGGA/GammaConv/AliConversionCuts.cxx b/PWGGA/GammaConv/AliConversionCuts.cxx
index c51bfbd59e945e4ce8590074a8f702e05a82ce75..3de79a7964b6083d1e813066406912b74c25a045 100644 (file)
--- a/PWGGA/GammaConv/AliConversionCuts.cxx
+++ b/PWGGA/GammaConv/AliConversionCuts.cxx
@@ -1105,6 +1105,7 @@ Bool_t AliConversionCuts::PhotonCuts(AliConversionPhotonBase *photon,AliVEvent *
       cutIndex++; //10
    }
    cutIndex++; //11
+
    if (photonAOD){
                if (fDoPhotonQualitySelectionCut && photonAOD->GetPhotonQuality() != fPhotonQualityCut){
                        if(hPhotonCuts)hPhotonCuts->Fill(cutIndex); //11
@@ -1212,7 +1213,6 @@ Bool_t AliConversionCuts::PhotonIsSelected(AliConversionPhotonBase *photon, AliV
 ///________________________________________________________________________
 Bool_t AliConversionCuts::ArmenterosQtCut(AliConversionPhotonBase *photon)
 {   // Armenteros Qt Cut
-
    if(fDo2DQt){
       if ( !(TMath::Power(photon->GetArmenterosAlpha()/0.95,2)+TMath::Power(photon->GetArmenterosQt()/fQtMax,2) < 1) ){
          return kFALSE;
@@ -2086,11 +2086,34 @@ void AliConversionCuts::PrintCutsWithValues() {
       } else if (fSpecialTrigger > 4){   
          printf("\t only events triggered by %s \n", fSpecialTriggerName.Data());
       }
-   }   
-   
-   
-   
+   }
+   printf("Electron cuts: \n");
+   if (fEtaCutMin > -0.1) printf("\t %3.2f < eta_{e} < %3.2f\n", fEtaCutMin, fEtaCut );
+     else printf("\t eta_{e} < %3.2f\n", fEtaCut );
+   printf("\t p_{T,e} > %3.2f\n", fSinglePtCut );
+   printf("\t %3.2f < n sigma e < %3.2f\n", fPIDnSigmaBelowElectronLine, fPIDnSigmaAboveElectronLine );
    
+   printf("Photon cuts: \n");
+   printf("\t %3.2f < R_{conv} < %3.2f\n", fMinR, fMaxR );
+   printf("\t Z_{conv} < %3.2f\n", fMaxZ );
+   if (fEtaCutMin > -0.1) printf("\t %3.2f < eta_{conv} < %3.2f\n", fEtaCutMin, fEtaCut );
+     else printf("\t eta_{conv} < %3.2f\n", fEtaCut );
+   printf("\t p_{T,gamma} > %3.2f\n", fPtCut );         
+   if (fDo2DQt){
+         printf("\t 2 dimensional q_{T} cut applied with maximum of %3.2f \n", fQtMax );
+   } else {
+         printf("\t 1 dimensional q_{T} cut applied with maximum of %3.2f \n", fQtMax );
+   }
+   if (fDo2DPsiPairChi2){
+         printf("\t 2 dimensional triangle chi^{2} and psi_{pair} cut applied with maximum of chi^{2} = %3.2f and |psi_{pair}| = %3.2f \n", fChi2CutConversion, fPsiPairCut ); 
+   } else {
+      printf("\t chi^{2} max cut chi^{2} < %3.2f \n", fChi2CutConversion ); 
+         printf("\t psi_{pair} max cut |psi_{pair}| < %3.2f \n", fPsiPairCut ); 
+   }      
+   printf("\t cos(Theta_{point}) > %3.2f \n", fCosPAngleCut );
+   printf("\t dca_{R} < %3.2f \n", fDCARPrimVtxCut );
+   printf("\t dca_{Z} < %3.2f \n", fDCAZPrimVtxCut );
+   if (fDoPhotonQualitySelectionCut) printf("\t selection based on photon quality with quality %d \n", fPhotonQualityCut );
 }
 
 ///________________________________________________________________________
@@ -3002,23 +3025,28 @@ Bool_t AliConversionCuts::SetSharedElectronCut(Int_t sharedElec) {
        case 0:
                fDoSharedElecCut = kFALSE;
                fDoPhotonQualitySelectionCut = kFALSE;
+               fPhotonQualityCut = 0;
                break;
        case 1:
                fDoSharedElecCut = kTRUE;
                fDoPhotonQualitySelectionCut = kFALSE;
+               fPhotonQualityCut = 0;
                break;
        case 2:
                fDoSharedElecCut = kFALSE;
                fDoPhotonQualitySelectionCut = kTRUE;
                fPhotonQualityCut = 1;
+               break;
        case 3:
                fDoSharedElecCut = kFALSE;
                fDoPhotonQualitySelectionCut = kTRUE;     
                fPhotonQualityCut = 2;
+               break;
        case 4:
                fDoSharedElecCut = kFALSE;
                fDoPhotonQualitySelectionCut = kTRUE;     
                fPhotonQualityCut = 3;
+               break;
        default:
                AliError(Form("Shared Electron Cut not defined %d",sharedElec));        
                return kFALSE;
@@ -3244,40 +3272,40 @@ Bool_t AliConversionCuts::IsCentralitySelected(AliVEvent *event, AliVEvent *fMCE
    Int_t PrimaryTracks10[10][2] =
       {
          {9999,9999}, //  0
-         {1210,928}, // 10
-         { 817,683}, // 20
-         { 536, 437}, // 30
-         { 337, 277}, // 40
+         {1210, 928}, // 10
+         { 817, 658}, // 20
+         { 536, 435}, // 30
+         { 337, 276}, // 40
          { 197, 162}, // 50
          { 106, 100}, // 60
-         {  51,  50}, // 70
-         {  21,  10}, // 80
+         {  51,  44}, // 70
+         {  21,  18}, // 80
          {   0,   0}  // 90
       };
    Int_t PrimaryTracks5a[10][2] =
       {
          {9999,9999}, // 0
          {1485,1168}, // 5
-         {1210,928}, // 10
-         { 995,800}, // 15
-         { 817,683}, // 20
-         { 666,1160}, // 25
-         { 536, 437}, // 30
+         {1210, 928}, // 10
+         { 995, 795}, // 15
+         { 817, 658}, // 20
+         { 666, 538}, // 25
+         { 536, 435}, // 30
          { 428, 350}, // 35
-         { 337, 277}, // 40
-         { 260, 200}  // 45
+         { 337, 276}, // 40
+         { 260, 214}  // 45
       };
    Int_t PrimaryTracks5b[10][2] =
       {
-         { 260, 200}, // 45
+         { 260, 214}, // 45
          { 197, 162}, // 50
          { 147, 125}, // 55
          { 106, 100}, // 60
-         {  75, 75}, // 65
-         {  51,  50}, // 70
-         {  34,  30}, // 75
-         {  21,  10}, // 80
-         {  13,  5}, // 85
+         {  75,  63}, // 65
+         {  51,  44}, // 70
+         {  34,  29}, // 75
+         {  21,  18}, // 80
+         {  13,  11}, // 85
          {   0,   0}  // 90
       };
 

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvV1_PbPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvV1_PbPb.C
index 96ea5eda0c90321e16bc6acb04df6f335dc95872..4af876c9650f1f35db67d15af4618f2880638b8e 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvV1_PbPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvV1_PbPb.C
@@ -485,11 +485,11 @@ void AddTask_GammaConvV1_PbPb(  Int_t trainConfig = 1,  //change different set o
       cutarray[ 3] = "7340001002092970028250400000"; mesonCutArray[ 3] = "01525065009000"; // 10-20%
       cutarray[ 4] = "7450001002092970028250400000"; mesonCutArray[ 4] = "01525065009000"; // 0-20%
    } else if ( trainConfig == 65){ // cleaner cuts
-      cutarray[ 0] = "7560001002092970028250400000"; mesonCutArray[ 0] = "01525065009000"; // 0-5%
-      cutarray[ 1] = "7670001002092970028250400000"; mesonCutArray[ 1] = "01525065009000"; // 5-10%
-      cutarray[ 2] = "7780001002092970028250400000"; mesonCutArray[ 2] = "01525065009000"; // 0-10%
-      cutarray[ 3] = "7890001002092970028250400000"; mesonCutArray[ 3] = "01525065009000"; // 10-20%
-      cutarray[ 4] = "7090001002092970028250400000"; mesonCutArray[ 4] = "01525065009000"; // 0-20%    
+               cutarray[ 0] = "7560001002092970028250400000"; mesonCutArray[0]= "01525065009000"; // 0-5%
+               cutarray[ 1] = "7670001002092970028250400000"; mesonCutArray[1]= "01525065009000"; // 5-10%
+               cutarray[ 2] = "7780001002092970028250400000"; mesonCutArray[2]= "01525065009000"; // 0-10%
+               cutarray[ 3] = "7890001002092970028250400000"; mesonCutArray[3]= "01525065009000"; // 10-20%
+               cutarray[ 4] = "7090001002092970028250400000"; mesonCutArray[4]= "01525065009000"; // 0-20%     
        } else if ( trainConfig == 66){ // variation eta  0.65
                cutarray[ 0] = "6010001032092970028250400000"; mesonCutArray[0]= "01523065009000"; // 0-5%
                cutarray[ 1] = "6120001032092970028250400000"; mesonCutArray[1]= "01523065009000"; // 5-10%