- changes to new Conv Calo Task for efficient running on the grid

diff --git a/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx b/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx
index be0ba5754e967a560c07f37e9318aa490f49eacd..b47a9a85bcbc24c11f0c6295783b7325b43f06c6 100644 (file)
--- a/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx
+++ b/PWGGA/GammaConv/AliAnalysisTaskGammaConvCalo.cxx
@@ -641,7 +641,7 @@ void AliAnalysisTaskGammaConvCalo::UserCreateOutputObjects(){
                }
 
                fTagOutputList[iCut] = new TList();
-               fTagOutputList[iCut]->SetName(Form("Tagging Output Cut Number %s_%s_%s",cutstring.Data(),cutstringCalo.Data(),cutstringMeson.Data()));
+               fTagOutputList[iCut]->SetName(Form("%s_%s_%s Tagging Output",cutstring.Data(),cutstringCalo.Data(),cutstringMeson.Data()));
                fTagOutputList[iCut]->SetOwner(1);
                fCutFolder[iCut]->Add(fTagOutputList[iCut]);
                

diff --git a/PWGGA/GammaConv/AliCaloPhotonCuts.cxx b/PWGGA/GammaConv/AliCaloPhotonCuts.cxx
index 86155b6796b14d31a146ef338e55fd33099956f9..9f2da5c87ad5d7aedb332237475f388786ef1890 100644 (file)
--- a/PWGGA/GammaConv/AliCaloPhotonCuts.cxx
+++ b/PWGGA/GammaConv/AliCaloPhotonCuts.cxx
@@ -918,6 +918,12 @@ void AliCaloPhotonCuts::PrintCuts() {
 
 void AliCaloPhotonCuts::PrintCutsWithValues() {
        // Print out current Cut Selection with value
+       printf("\nCluster cutnumber \n");
+       for(Int_t ic = 0; ic < kNCuts; ic++) {
+               printf("%d",fCuts[ic]);
+       }
+       printf("\n\n");
+
        printf("Acceptance cuts: \n");
        if (fClusterType == 0) printf("\tall calorimeter clusters are used\n");
        if (fClusterType == 1) printf("\tEMCAL calorimeter clusters are used\n");

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C
index f663be6229f508c955c8a6c12d639bace2fe5412..a18a77c37ed0e507b79190de44de81efba1c903d 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_PbPb.C
@@ -109,11 +109,11 @@ void AddTask_GammaConvCalo_PbPb(          Int_t trainConfig = 1,  //change different s
                cutarray[ 3] = "5240001002092970028250400000"; clustercutarray[3] = "10000040022030000"; mesonCutArray[ 3] = "01525065000000"; // 20-40%
                cutarray[ 4] = "5250001002092970028250400000"; clustercutarray[4] = "10000040022030000"; mesonCutArray[ 4] = "01525065000000"; // 20-50%
        } else if (trainConfig == 2){ // PHOS clusters
-               cutarray[ 0] = "6010001002092970028250400000"; clustercutarray[0] = "20000040022030000"; mesonCutArray[ 0] = "01525065000000"; // 0-5%
-               cutarray[ 1] = "6120001002092970028250400000"; clustercutarray[1] = "20000040022030000"; mesonCutArray[ 1] = "01525065000000"; // 5-10%
-               cutarray[ 2] = "5010001002092970028250400000"; clustercutarray[2] = "20000040022030000"; mesonCutArray[ 2] = "01525065000000"; // 0-10%
-               cutarray[ 3] = "5240001002092970028250400000"; clustercutarray[3] = "20000040022030000"; mesonCutArray[ 3] = "01525065000000"; // 20-40%
-               cutarray[ 4] = "5250001002092970028250400000"; clustercutarray[4] = "20000040022030000"; mesonCutArray[ 4] = "01525065000000"; // 20-50%
+               cutarray[ 0] = "6010001002092970028250400000"; clustercutarray[0] = "20000030022000000"; mesonCutArray[ 0] = "01525065000000"; // 0-5%
+               cutarray[ 1] = "6120001002092970028250400000"; clustercutarray[1] = "20000030022000000"; mesonCutArray[ 1] = "01525065000000"; // 5-10%
+               cutarray[ 2] = "5010001002092970028250400000"; clustercutarray[2] = "20000030022000000"; mesonCutArray[ 2] = "01525065000000"; // 0-10%
+               cutarray[ 3] = "5240001002092970028250400000"; clustercutarray[3] = "20000030022000000"; mesonCutArray[ 3] = "01525065000000"; // 20-40%
+               cutarray[ 4] = "5250001002092970028250400000"; clustercutarray[4] = "20000030022000000"; mesonCutArray[ 4] = "01525065000000"; // 20-50%
 
                
        } else {
@@ -122,6 +122,7 @@ void AddTask_GammaConvCalo_PbPb(    Int_t trainConfig = 1,  //change different s
        }
 
        TList *ConvCutList = new TList();
+       TList *ClusterCutList = new TList();
        TList *MesonCutList = new TList();
 
        TList *HeaderList = new TList();

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
index 537b2d43d1b21b2a351466a75b8f667b55c27465..887c71e1dc360372fbb7f8aa0e384ccd16dfe911 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pPb.C
@@ -108,8 +108,8 @@ void AddTask_GammaConvCalo_pPb(  Int_t trainConfig = 1,  //change different set
                cutarray[ 0] = "8000001002092970028250400000"; clustercutarray[0] = "10000040022030000"; mesonCutArray[0] = "01525065000000"; //standart cut, kINT7 // EMCAL clusters
                cutarray[ 1] = "8005201002092970028250400000"; clustercutarray[1] = "10000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut, kEMC7 // EMCAL clusters
        } else if (trainConfig == 2) {  
-               cutarray[ 0] = "8000001002092970028250400000"; clustercutarray[0] = "20000040022030000"; mesonCutArray[0] = "01525065000000"; //standart cut, kINT7 // PHOS clusters
-               cutarray[ 1] = "8006201002092970028250400000"; clustercutarray[1] = "20000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut, kPHI7     // PHOS clusters        
+               cutarray[ 0] = "8000001002092970028250400000"; clustercutarray[0] = "20000030022000000"; mesonCutArray[0] = "01525065000000"; //standart cut, kINT7 // PHOS clusters
+               cutarray[ 1] = "8006201002092970028250400000"; clustercutarray[1] = "20000030022000000"; mesonCutArray[1] = "01525065000000"; //standard cut, kPHI7     // PHOS clusters        
        } else {
                Error(Form("GammaConvCalo_%i",trainConfig), "wrong trainConfig variable no cuts have been specified for the configuration");
                return;
@@ -148,8 +148,6 @@ void AddTask_GammaConvCalo_pPb(  Int_t trainConfig = 1,  //change different set
                ConvCutList->Add(analysisCuts[i]);
                analysisCuts[i]->SetFillCutHistograms("",kFALSE);
                
-               Printf("here %d %s\n", i, clustercutarray[i].Data() );
-               
                analysisClusterCuts[i] = new AliCaloPhotonCuts();
                analysisClusterCuts[i]->InitializeCutsFromCutString(clustercutarray[i].Data());
                ClusterCutList->Add(analysisClusterCuts[i]);

diff --git a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
index 6f53fb7184b4f57dc6cafa10a53e0638ad72ad2d..a48971a6c82d8bb7b160df92893ab66af5682320 100644 (file)
--- a/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
+++ b/PWGGA/GammaConv/macros/AddTask_GammaConvCalo_pp.C
@@ -104,9 +104,9 @@ void AddTask_GammaConvCalo_pp(  Int_t trainConfig = 1,  //change different set o
                cutarray[ 1] = "0005101002092970028250400000"; clustercutarray[1] = "10000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kEMC1 // EMCAL clusters
                cutarray[ 2] = "0002001002092970028250400000"; clustercutarray[2] = "10000040022030000"; mesonCutArray[2] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, SDD V0OR // EMCAL clusters
        } else if (trainConfig == 2){ 
-               cutarray[ 0] = "0000001002092970028250400000"; clustercutarray[0] = "20000040022030000"; mesonCutArray[0] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kMB   // PHOS clusters
-               cutarray[ 1] = "0006101002092970028250400000"; clustercutarray[1] = "20000040022030000"; mesonCutArray[1] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kPHI1 // PHOS clusters
-               cutarray[ 2] = "0002001002092970028250400000"; clustercutarray[2] = "20000040022030000"; mesonCutArray[2] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, SDD V0OR //PHOS clusters
+               cutarray[ 0] = "0000001002092970028250400000"; clustercutarray[0] = "20000030022000000"; mesonCutArray[0] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kMB   // PHOS clusters
+               cutarray[ 1] = "0006101002092970028250400000"; clustercutarray[1] = "20000030022000000"; mesonCutArray[1] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, kPHI1 // PHOS clusters
+               cutarray[ 2] = "0002001002092970028250400000"; clustercutarray[2] = "20000030022000000"; mesonCutArray[2] = "01525065000000"; //standard cut LHC11h pp 2.76TeV, SDD V0OR //PHOS clusters
 
                
        } else {
@@ -115,6 +115,7 @@ void AddTask_GammaConvCalo_pp(  Int_t trainConfig = 1,  //change different set o
        }
 
        TList *ConvCutList = new TList();
+       TList *ClusterCutList = new TList();
        TList *MesonCutList = new TList();
 
        TList *HeaderList = new TList();