Change default parameter to not subtract D-daughters from the multiplicity estimation

[u/mrichter/AliRoot.git] / PWGHF / vertexingHF / macros / AddTaskCFVertexingHF3Prong.C

diff --git a/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C b/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C
index c8bd88b8ef0fa9d0bd1cbe90e7d162559b87fa69..5f9273079f6e118fb46ae27d7b6f583fa6ba9579 100644 (file)
--- a/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C
+++ b/PWGHF/vertexingHF/macros/AddTaskCFVertexingHF3Prong.C
@@ -573,18 +573,6 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3Prong(TString suffixName="", const ch
        Printf("decay channel = %d",(Int_t)task->GetDecayChannel());
        Printf("FillFromGenerated = %d",(Int_t)task->GetFillFromGenerated());
        Printf("Dselection = %d",(Int_t)task->GetDselection());
-       Printf("UseWeight = %d",(Int_t)task->GetUseWeight());
-       if (task->GetUseWeight()) {
-               funcWeight = (TF1*)cutFile->Get("funcWeight");
-               if (funcWeight == 0x0){
-                       Printf("FONLL Weights will be used");
-               }
-               else {
-                       task->SetWeightFunction(funcWeight);
-                       Printf("User-defined Weights will be used. The function being:");
-                       task->GetWeightFunction()->Print();
-               }
-       }
        Printf("Sign = %d",(Int_t)task->GetSign());
        Printf("Centrality selection = %d",(Int_t)task->GetCentralitySelection());
        Printf("Fake selection = %d",(Int_t)task->GetFakeSelection());
@@ -650,28 +638,30 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3Prong(TString suffixName="", const ch
        // ----- output data -----
        
        TString outputfile = AliAnalysisManager::GetCommonFileName();
-       TString output1name="", output2name="", output3name="", output4name="";;
+       TString output1name="", output2name="", output3name="", output4name="";
        output2name=nameContainer;
        output3name=nameCorr;
        if(!isKeepDfromB) {
                outputfile += ":PWG3_D2H_CFtaskDplustoKpipi_Prompt";
                output1name="CFHFhist_DplustoKpipi_Prompt";
+               output3name+="_Prompt";
                output4name= "Cuts_DplustoKpipi_Prompt";
        }
        else  if(isKeepDfromBOnly){
                outputfile += ":PWG3_D2H_CFtaskDplustoKpipi_FromB";
                output1name="CFHFhist_DplustoKpipi_FromB";
+               output3name+="_FromB";
                output4name= "Cuts_DplustoKpipi_FromB";
        }
        else{
                outputfile += ":PWG3_D2H_CFtaskDplustoKpipi_All";
                output1name="CFHFhist_DplustoKpipi_All";
+               output3name+="_All";
                output4name= "Cuts_DplustoKpipi_All";
        }
        outputfile += suffixName.Data();
        output1name += suffixName.Data();
        output4name += suffixName.Data();
-       
 
        //now comes user's output objects :
        // output TH1I for event counting
@@ -691,5 +681,5 @@ AliCFTaskVertexingHF *AddTaskCFVertexingHF3Prong(TString suffixName="", const ch
        mgr->ConnectOutput(task,4,coutput4);
 
        return task;
-       }
+}