modified addtasks for calos

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaCalo_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaCalo_pPb.C
index 3bc4a12425868eee34d1f551e58f1f6f5d0aaf42..c51c2a78905c54f4e56595e6c407579b2dade268 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaCalo_pPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaCalo_pPb.C
@@ -1,12 +1,13 @@
-void AddTask_GammaCalo_pPb(  Int_t trainConfig = 1,  //change different set of cuts
-                              Bool_t isMC   = kFALSE, //run MC
-                              Int_t enableQAMesonTask = 0, //enable QA in AliAnalysisTaskGammaConvV1
-                              Int_t enableQAClusterTask = 0, // enable additional QA task
-                              TString fileNameInputForWeighting = "MCSpectraInput.root", // path to file for weigting input
-                              Int_t doWeightingPart = 0,  //enable Weighting
-                              TString generatorName = "DPMJET",
-                              TString cutnumberAODBranch = "8000000060084000001500000" // cutnumber for AOD branch
-                                                       ) {
+void AddTask_GammaCalo_pPb(  
+                                                       Int_t trainConfig = 1,  //change different set of cuts
+                                                       Bool_t isMC   = kFALSE, //run MC
+                                                       Int_t enableQAMesonTask = 0, //enable QA in AliAnalysisTaskGammaConvV1
+                                                       Int_t enableQAClusterTask = 0, // enable additional QA task
+                                                       TString fileNameInputForWeighting = "MCSpectraInput.root", // path to file for weigting input
+                                                       Int_t doWeightingPart = 0,  //enable Weighting
+                                                       TString generatorName = "DPMJET",
+                                                       TString cutnumberAODBranch = "8000000060084000001500000" // cutnumber for AOD branch
+                                                  ) {
 
        // ================= Load Librariers =================================
        gSystem->Load("libCore.so");  
@@ -109,7 +110,7 @@ void AddTask_GammaCalo_pPb(  Int_t trainConfig = 1,  //change different set of c
        // Cut Numbers to use in Analysis
        Int_t numberOfCuts = 2;
        if (trainConfig == 3 || trainConfig == 5  ){ numberOfCuts = 6;}
-       if (trainConfig == 6 ){ numberOfCuts = 1;}
+       if (trainConfig == 6 || trainConfig == 7 ){ numberOfCuts = 1;}
        
        TString *eventCutArray = new TString[numberOfCuts];
        TString *clusterCutArray = new TString[numberOfCuts];
@@ -142,8 +143,10 @@ void AddTask_GammaCalo_pPb(  Int_t trainConfig = 1,  //change different set of c
                eventCutArray[ 3] = "8009101"; clusterCutArray[3] = "10000040052030000"; mesonCutArray[3] = "01525065000000"; //standard cut, kEMCEJE based on INT7 // EMCAL clusters
                eventCutArray[ 4] = "8009301"; clusterCutArray[4] = "10000040052030000"; mesonCutArray[4] = "01525065000000"; //standard cut, kEMCEJ1 based on INT7 // EMCAL clusters
                eventCutArray[ 5] = "8009501"; clusterCutArray[5] = "10000040052030000"; mesonCutArray[5] = "01525065000000"; //standard cut, kEMCEG2 based on INT7 // EMCAL clusters           
-       } else if (trainConfig == 6){ // Validation
+       } else if (trainConfig == 6){ // Validation EMCAL
                eventCutArray[ 0] = "8000001"; clusterCutArray[0] = "10000040062000000"; mesonCutArray[0] = "01630031009000";   
+       } else if (trainConfig == 7){ // Validation PHOS
+               eventCutArray[ 0] = "8000001"; clusterCutArray[0] = "20000040053200000"; mesonCutArray[0] = "01630031009000";   
        } else {
                Error(Form("GammaCalo_%i",trainConfig), "wrong trainConfig variable no cuts have been specified for the configuration");
                return;

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaCalo_pp.C b/PWGGA/GammaConv/macros/AddTask_GammaCalo_pp.C
index d9f043606a2b4504d458c39754108d01c296ea5c..741f9cf09dbcfa88c829b57b79b5b7c6a4295a71 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaCalo_pp.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaCalo_pp.C
@@ -163,13 +163,15 @@ void AddTask_GammaCalo_pp(  Int_t trainConfig = 1,  //change different set of cu
                eventCutArray[ 3] = "0009311"; clusterCutArray[3] = "10000040022030000"; mesonCutArray[3] = "01631031009000"; 
                eventCutArray[ 4] = "0008511"; clusterCutArray[4] = "10000040022030000"; mesonCutArray[4] = "01631031009000"; 
                eventCutArray[ 5] = "0009511"; clusterCutArray[5] = "10000040022030000"; mesonCutArray[5] = "01631031009000"; 
-       } else if (trainConfig == 10){ // Validation
+       } else if (trainConfig == 10){ // Validation EMCAL
                eventCutArray[ 0] = "0000311"; clusterCutArray[0] = "10000040062000000"; mesonCutArray[0] = "01630031009000"; 
        } else if (trainConfig == 31) { //PHOS clusters
                eventCutArray[ 0] = "0000311"; clusterCutArray[0] = "20000040053200000"; mesonCutArray[0] = "01631031009000"; //pp LHC11a with SDD, PHOS
                eventCutArray[ 1] = "0000011"; clusterCutArray[1] = "20000040053200000"; mesonCutArray[1] = "01631031009000"; //pp LHC13g default MB
                eventCutArray[ 2] = "0006111"; clusterCutArray[2] = "20000040053200000"; mesonCutArray[2] = "01631031009000"; //pp LHC11a PHI1
                eventCutArray[ 3] = "0006211"; clusterCutArray[3] = "20000040053200000"; mesonCutArray[3] = "01631031009000"; //pp LHC11a PHI7
+       } else if (trainConfig == 32){ // Validation PHOS
+               eventCutArray[ 0] = "0000311"; clusterCutArray[0] = "20000040053200000"; mesonCutArray[0] = "01630031009000";           
        } else {
                Error(Form("GammaCalo_%i",trainConfig), "wrong trainConfig variable no cuts have been specified for the configuration");
                return;

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
index ed7ec5bf7b9fef4e5ff39d42f65d065fb326a6b7..38c2ab6823b986ea3b27bea910c38c8b3d6869d0 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
@@ -190,7 +190,7 @@ void AddTask_GammaConvCalo_pp(  Int_t trainConfig = 1,  //change different set o
                eventCutArray[ 1] = "0000011"; photonCutArray[ 1] = "002093663003800000000"; clusterCutArray[1] = "20000042053200000"; mesonCutArray[1] = "01631031009000"; //pp LHC13g default MB
                eventCutArray[ 2] = "0006111"; photonCutArray[ 2] = "002093663003800000000"; clusterCutArray[2] = "20000042053200000"; mesonCutArray[2] = "01631031009000"; //pp LHC11a PHI1
                eventCutArray[ 3] = "0006211"; photonCutArray[ 3] = "002093663003800000000"; clusterCutArray[3] = "20000042053200000"; mesonCutArray[3] = "01631031009000"; //pp LHC11a PHI7
-       } else if (trainConfig == 32) { //PHOS clusters, track matching 0.04
+       } else if (trainConfig == 33) { //PHOS clusters, track matching 0.04
                eventCutArray[ 0] = "0000311"; photonCutArray[ 0] = "002093663003800000000"; clusterCutArray[0] = "20000043053200000"; mesonCutArray[0] = "01631031009000"; //pp LHC11a with SDD, PHOS
                eventCutArray[ 1] = "0000011"; photonCutArray[ 1] = "002093663003800000000"; clusterCutArray[1] = "20000043053200000"; mesonCutArray[1] = "01631031009000"; //pp LHC13g default MB
                eventCutArray[ 2] = "0006111"; photonCutArray[ 2] = "002093663003800000000"; clusterCutArray[2] = "20000043053200000"; mesonCutArray[2] = "01631031009000"; //pp LHC11a PHI1