Updates to run on the train Ds and Dplus efficiency together (Zaida)

diff --git a/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C b/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C
index 8f9342f3fbbd56c4fe04c903b6d2b592aee10a68..f8e8096052af0b58ef3e311ef10002ec83ffd7cf 100644 (file)
--- a/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C
+++ b/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C
@@ -330,15 +330,15 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3Prong(TString suffixName="", const ch
        //one "container" for MC
        TString nameContainer="";
        if(!isKeepDfromB) {
-               nameContainer="CFHFccontainer0_3Prong_CommonFramework";
+               nameContainer="CFHFccontainer0_3ProngDplustoKpipi_CommonFramework";
                
        }
        else  if(isKeepDfromBOnly){
-               nameContainer="CFHFccontainer0DfromB_3Prong_CommonFramework";
+               nameContainer="CFHFccontainer0DfromB_3ProngDplustoKpipi_CommonFramework";
                
        }
        else  {
-               nameContainer="CFHFccontainer0allD_3Prong_CommonFramework";          
+               nameContainer="CFHFccontainer0allD_3ProngDplustoKpipi_CommonFramework";          
        }
 
        
@@ -592,13 +592,13 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3Prong(TString suffixName="", const ch
 
        TString nameCorr="";
        if(!isKeepDfromB) {
-               nameCorr="CFHFcorr0_3Prong_CommonFramework";
+               nameCorr="CFHFcorr0_3ProngDplustoKpipi_CommonFramework";
        }
        else  if(isKeepDfromBOnly){
-               nameCorr= "CFHFcorr0KeepDfromBOnly_3Prong_CommonFramework";
+               nameCorr= "CFHFcorr0KeepDfromBOnly_3ProngDplustoKpipi_CommonFramework";
        }
        else  {
-               nameCorr="CFHFcorr0allD_3Prong_CommonFramework";                
+               nameCorr="CFHFcorr0allD_3ProngDplustoKpipi_CommonFramework";            
        }
        
 
@@ -636,18 +636,21 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3Prong(TString suffixName="", const ch
        output3name=nameCorr;
        if(!isKeepDfromB) {
                outputfile += ":PWG3_D2H_CFtaskDplustoKpipi_CommonFramework";
-               output1name="CFHFchist0_3Prong_CommonFramework";
-               output4name= "Cuts_3Prong_CommonFramework";
+               output1name="CFHFchist0_3ProngDplustoKpipi_CommonFramework";
+               output3name+="_cOnly";
+               output4name= "Cuts_3ProngDplustoKpipi_CommonFramework";
        }
        else  if(isKeepDfromBOnly){
                outputfile += ":PWG3_D2H_CFtaskDplustoKpipiKeepDfromBOnly_CommonFramework";
-               output1name="CFHFchist0DfromB_3Prong_CommonFramework";
-               output4name= "CutsDfromB_3Prong_CommonFramework";
+               output1name="CFHFchist0DfromB_3ProngDplustoKpipi_CommonFramework";
+               output3name+="_bOnly";
+               output4name= "CutsDfromB_3ProngDplustoKpipi_CommonFramework";
        }
        else{
                outputfile += ":PWG3_D2H_CFtaskDplustoKpipiKeepDfromB_CommonFramework";
-               output1name="CFHFchist0allD_3Prong_CommonFramework";
-               output4name= "CutsallD_3Prong_CommonFramework";
+               output1name="CFHFchist0allD_3ProngDplustoKpipi_CommonFramework";
+               output3name+="_all";
+               output4name= "CutsallD_3ProngDplustoKpipi_CommonFramework";
        }
        outputfile += suffixName.Data();
        output1name += suffixName.Data();
@@ -675,4 +678,3 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3Prong(TString suffixName="", const ch
 
        return task;
 }
-

diff --git a/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3ProngDs.C b/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3ProngDs.C
index 206950100885e5d424b704a96e93d63d2454d6f8..7782f10d7b5c94dd5696f499cf35dfeb6a4dc04b 100644 (file)
--- a/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3ProngDs.C
+++ b/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3ProngDs.C
@@ -336,13 +336,13 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3ProngDs(TString suffixName="", Int_t
        //one "container" for MC
        TString nameContainer="";
        if(!isKeepDfromB) {
-               nameContainer="CFHFccontainer0_3Prong_CommonFramework";
+               nameContainer="CFHFccontainer0_3ProngDstoKKpi_CommonFramework";
        }
        else  if(isKeepDfromBOnly){
-               nameContainer="CFHFccontainer0DfromB_3Prong_CommonFramework";
+               nameContainer="CFHFccontainer0DfromB_3ProngDstoKKpi_CommonFramework";
        }
        else  {
-               nameContainer="CFHFccontainer0allD_3Prong_CommonFramework";          
+               nameContainer="CFHFccontainer0allD_3ProngDstoKKpi_CommonFramework";          
        }
        nameContainer+=suffixDecayType.Data();
        nameContainer+=suffixName.Data();
@@ -602,13 +602,13 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3ProngDs(TString suffixName="", Int_t
 
        TString nameCorr="";
        if(!isKeepDfromB) {
-               nameCorr="CFHFcorr0_3Prong_CommonFramework";
+               nameCorr="CFHFcorr0_3ProngDstoKKpi_CommonFramework";
        }
        else  if(isKeepDfromBOnly){
-               nameCorr= "CFHFcorr0KeepDfromBOnly_3Prong_CommonFramework";
+               nameCorr= "CFHFcorr0KeepDfromBOnly_3ProngDstoKKpi_CommonFramework";
        }
        else  {
-               nameCorr="CFHFcorr0allD_3Prong_CommonFramework";                
+               nameCorr="CFHFcorr0allD_3ProngDstoKKpi_CommonFramework";                
        }
        nameCorr+=suffixDecayType.Data();
        nameCorr+=suffixName.Data();
@@ -647,17 +647,20 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3ProngDs(TString suffixName="", Int_t
        output3name=nameCorr;
        if(!isKeepDfromB) {
                outputfile += ":PWG3_D2H_CFtaskDstoKKpi_CommonFramework";
-               output1name="CFHFchist0_3Prong_CommonFramework";
+               output1name="CFHFchist0_3ProngDstoKKpi_CommonFramework";
+               output3name+="_cOnly";
                output4name= "CutsDdirect_3ProngDs_CommonFramework";
        }
        else  if(isKeepDfromBOnly){
                outputfile += ":PWG3_D2H_CFtaskDstoKKpiKeepDfromBOnly_CommonFramework";
-               output1name="CFHFchist0DfromB_3Prong_CommonFramework";
+               output1name="CFHFchist0DfromB_3ProngDstoKKpi_CommonFramework";
+               output3name+="_bOnly";
                output4name= "CutsDfromB_3ProngDs_CommonFramework";
        }
        else{
                outputfile += ":PWG3_D2H_CFtaskDstoKKpiKeepDfromB_CommonFramework";
-               output1name="CFHFchist0allD_3Prong_CommonFramework";
+               output1name="CFHFchist0allD_3ProngDstoKKpi_CommonFramework";
+               output3name+="_all";
                output4name= "CutsallD_3ProngDs_CommonFramework";
        }
 
@@ -667,6 +670,8 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3ProngDs(TString suffixName="", Int_t
        
        outputfile += suffixName.Data();
        output1name+= suffixName.Data();
+       output2name+= suffixName.Data();
+       output3name+= suffixName.Data();
        output4name+= suffixName.Data();
 
        //now comes user's output objects :
@@ -688,4 +693,3 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3ProngDs(TString suffixName="", Int_t
 
        return task;
 }
-