-changes for trigger config in addtasks

diff --git a/PWGGA/GammaConv/AliConversionPhotonCuts.cxx b/PWGGA/GammaConv/AliConversionPhotonCuts.cxx
index 4ee0b1c2b021d28cdcb557658a3fc6e5ee24d555..22dbe7d649c4ed739584ac01f4f6f63958e2d757 100644 (file)
--- a/PWGGA/GammaConv/AliConversionPhotonCuts.cxx
+++ b/PWGGA/GammaConv/AliConversionPhotonCuts.cxx
@@ -1883,7 +1883,8 @@ Bool_t AliConversionPhotonCuts::SetMinPhiSectorCut(Int_t minPhiCut) {
 
        switch(minPhiCut) {
        case 0:
-               fMinPhiCut = 6.3; //no cut on phi
+               fDoShrinkTPCAcceptance = kFALSE;
+               fMinPhiCut = 0;
                break;
        case 1:
                if (!fDoShrinkTPCAcceptance) fDoShrinkTPCAcceptance = kTRUE;
@@ -1916,7 +1917,8 @@ Bool_t AliConversionPhotonCuts::SetMaxPhiSectorCut(Int_t maxPhiCut) {
 
        switch(maxPhiCut) {
        case 0:
-               fMaxPhiCut = 0.; //no cut
+               if (!fDoShrinkTPCAcceptance) fDoShrinkTPCAcceptance = kFALSE;
+               fMaxPhiCut = 2*TMath::Pi()+0.00001;
                break;
        case 1:
                if (!fDoShrinkTPCAcceptance) fDoShrinkTPCAcceptance = kTRUE;

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
index a5a9ca251d8a2a4a99a723da7af8f7a8208b280b..afc9e999418414a0db82d92ce6275d015b425237 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
@@ -114,6 +114,7 @@ void AddTask_GammaConvCalo_pPb(  Int_t trainConfig = 1,  //change different set
        task->SetIsMC(isMC);
        // Cut Numbers to use in Analysis
        Int_t numberOfCuts = 2;
+       if (trainConfig==10 ){ numberOfCuts =4;}
        if (trainConfig==2 || trainConfig==4  ){ numberOfCuts =6;}
        if (trainConfig==5 || trainConfig==6 || trainConfig==7 || trainConfig==8 || trainConfig==32 || trainConfig==33){ numberOfCuts =5;}
        
@@ -174,6 +175,11 @@ void AddTask_GammaConvCalo_pPb(  Int_t trainConfig = 1,  //change different set
        } else if (trainConfig == 9){ //PCM restriction in acceptance 
                eventCutArray[ 0] = "8000001"; photonCutArray[ 0] = "002022093270028250400000"; clusterCutArray[0] = "10000042032030000"; mesonCutArray[0] = "01631031000000"; // PCM photons pointing to EMCAL loose
                eventCutArray[ 1] = "8000001"; photonCutArray[ 1] = "002044093270028250400000"; clusterCutArray[1] = "10000042032030000"; mesonCutArray[1] = "01631031000000"; // PCM photons pointing to EMCAL tight
+       } else if (trainConfig == 10){ 
+               eventCutArray[ 0] = "8005201"; photonCutArray[ 0] = "002000093270028250400000"; clusterCutArray[0] = "10000042062030000"; mesonCutArray[0] = "01631031000000"; 
+               eventCutArray[ 1] = "8005201"; photonCutArray[ 1] = "002000093270028250400000"; clusterCutArray[1] = "10000042072030000"; mesonCutArray[1] = "01631031000000"; 
+               eventCutArray[ 2] = "8005201"; photonCutArray[ 2] = "002000093270028250400000"; clusterCutArray[2] = "10000042082030000"; mesonCutArray[2] = "01631031000000"; 
+               eventCutArray[ 3] = "8005201"; photonCutArray[ 3] = "002000093270028250400000"; clusterCutArray[3] = "10000042092030000"; mesonCutArray[3] = "01631031000000"; 
                
        //************************************************ PHOS clusters **********************************************************     
        } else if (trainConfig == 31) { // min energy = 0.3 GeV/c

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
index feb63e47e8efdd2da76046500a63e485aa2cf98b..9908c5b1ab266c085b432aaa54a2209eef2d5ff0 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
@@ -113,8 +113,8 @@ void AddTask_GammaConvCalo_pp(  Int_t trainConfig = 1,  //change different set o
        // Cut Numbers to use in Analysis
        Int_t numberOfCuts = 2;
        if (trainConfig==2 || trainConfig==3 || trainConfig==4 || trainConfig==5 || trainConfig==6 || trainConfig==7 ){ numberOfCuts =5;}
-       if (trainConfig==8 ){ numberOfCuts =4;}
-       if (trainConfig==10 || trainConfig==31 || trainConfig==32 ){ numberOfCuts =6;}
+       if (trainConfig==8 || trainConfig==10){ numberOfCuts =4;}
+       if (trainConfig==11 || trainConfig==31 || trainConfig==32 ){ numberOfCuts =6;}
 
        TString *eventCutArray = new TString[numberOfCuts];
        TString *photonCutArray = new TString[numberOfCuts];
@@ -174,8 +174,13 @@ void AddTask_GammaConvCalo_pp(  Int_t trainConfig = 1,  //change different set o
        } else if (trainConfig == 9){ // PCM variations
                eventCutArray[ 0] = "0000311"; photonCutArray[ 0] = "002022093270008250400000"; clusterCutArray[0] = "10000042032030000"; mesonCutArray[0] = "01631031000000"; // restrict acceptance to EMCAL loose
                eventCutArray[ 1] = "0000311"; photonCutArray[ 1] = "002044093270008250400000"; clusterCutArray[1] = "10000042032030000"; mesonCutArray[1] = "01631031000000"; // restrict acceptance to EMCAL tight
+       } else if (trainConfig == 10){ // EMCAL clusters 2.76 TeV LHC11a, with SDD (0), kEMC1 (1)
+               eventCutArray[ 0] = "0005111"; photonCutArray[ 0] = "002000093270008250400000"; clusterCutArray[0] = "10000042062030000"; mesonCutArray[0] = "01631031000000"; // min Energy cluster = 4.5 GeV
+               eventCutArray[ 1] = "0005111"; photonCutArray[ 1] = "002000093270008250400000"; clusterCutArray[1] = "10000042072030000"; mesonCutArray[1] = "01631031000000"; // min Energy cluster = 5.0 GeV
+               eventCutArray[ 2] = "0005111"; photonCutArray[ 2] = "002000093270008250400000"; clusterCutArray[2] = "10000042082030000"; mesonCutArray[2] = "01631031000000"; // min Energy cluster = 5.5 GeV
+               eventCutArray[ 3] = "0005111"; photonCutArray[ 3] = "002000093270008250400000"; clusterCutArray[3] = "10000042092030000"; mesonCutArray[3] = "01631031000000"; // min Energy cluster = 6.0 GeV
                // LHC13g       
-       } else if (trainConfig == 10){  // EMCAL clusters, EMCEGA triggers, track matching 0.035
+       } else if (trainConfig == 11){  // EMCAL clusters, EMCEGA triggers, track matching 0.035
                eventCutArray[ 0] = "0008311"; photonCutArray[ 0] = "002000093270008250400000"; clusterCutArray[0] = "10000042032030000"; mesonCutArray[0] = "01631031000000"; // EMCEG1, 
                eventCutArray[ 1] = "0008511"; photonCutArray[ 1] = "002000093270008250400000"; clusterCutArray[1] = "10000042032030000"; mesonCutArray[1] = "01631031000000"; // EMCEG2, 
                eventCutArray[ 2] = "0009311"; photonCutArray[ 2] = "002000093270008250400000"; clusterCutArray[2] = "10000042032030000"; mesonCutArray[2] = "01631031000000"; // EMCEJ1,