Use std output and MC trigger

[u/mrichter/AliRoot.git] / PWGJE / FlavourJetTasks / macros / AddTasksFlavourJet.C

diff --git a/PWGJE/FlavourJetTasks/macros/AddTasksFlavourJet.C b/PWGJE/FlavourJetTasks/macros/AddTasksFlavourJet.C
index b004a95af15c10c536a3698a019d06daadc5fbc5..76f2f580f2cb309de1d3abfcdfc367e19a5d5e89 100644 (file)
--- a/PWGJE/FlavourJetTasks/macros/AddTasksFlavourJet.C
+++ b/PWGJE/FlavourJetTasks/macros/AddTasksFlavourJet.C
@@ -58,11 +58,9 @@ void AddTasksFlavourJet(const Int_t iCandType = 1 /*0 = D0, 1=Dstar...*/,
    
    // -- D meson selection
   
-   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/FlavourJetTasks/macros/AddTaskSEDmesonsFilterCJ.C");
-   AliAnalysisTaskSEDmesonsFilterCJ *taskDmesonsFilter = AddTaskSEDmesonsFilterCJ(iCandType,sCutFile,bIsMC,bIsReco,sText);
-   if(bIsMap) {
-      AliAnalysisTaskSEDmesonsFilterCJ *taskMCDmesonsFilter = AddTaskSEDmesonsFilterCJ(iCandType,sCutFile,bIsMC,kFALSE,sText);
-   }
+   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/FlavourJetTasks/macros/AddTaskDFilterAndCorrelations.C");
+
+
    // EMCal framework
    // -- Physics selection task
    gROOT->LoadMacro("$ALICE_ROOT/PWG/EMCAL/macros/AddTaskEmcalPhysicsSelection.C");
@@ -91,7 +89,6 @@ void AddTasksFlavourJet(const Int_t iCandType = 1 /*0 = D0, 1=Dstar...*/,
    gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJet.C");
    //gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetSample.C");
    
-   gROOT->LoadMacro("$ALICE_ROOT/PWGJE/FlavourJetTasks/macros/AddTaskFlavourJetCorrelations.C");
    gROOT->LoadMacro("$ALICE_ROOT/PWGJE/EMCALJetTasks/macros/AddTaskJetResponseMaker.C");
    
    for (Int_t i=0; i<nRadius; i++) {
@@ -108,63 +105,55 @@ void AddTasksFlavourJet(const Int_t iCandType = 1 /*0 = D0, 1=Dstar...*/,
        // "AliAnalysisTaskEmcalJetSample");
       //taskjetsample->SelectCollisionCandidates(uTriggerMask);
       
-      //correlation with D meson
+      //Filter and correlation with D meson
       
-      AliAnalysisTaskFlavourJetCorrelations *taskDmesonCJ = AddTaskFlavourJetCorrelations(
-        iCandType,
+      AddTaskDFilterAndCorrelations(
+        iCandType,
         sCutFile,
         bIsMC,
         bIsReco,
+        "",
         taskFJ->GetName(),
-        Form("JetR%s",sRadius[i].Data()),
+        //Form("JetR%s",sRadius[i].Data()),
         iLeading,
         leadHadType,
         aRadius[i],
         dJetPtCut,
         acctype
-       /*percjetareacut=1.*/);
-      
-      taskDmesonCJ->SetName(Form("AliAnalysisTaskSEEmcalJetDmesonsCJ_%s",sRadius[i].Data()));
-      taskDmesonCJ->SetForceBeamType(uBeamType);
-      taskDmesonCJ->SetAnaType(uAnaType);
-      taskDmesonCJ->SetLeadingHadronType(iLeading);
+       //percjetareacut=1.
+         );
       
       AliEmcalJetTask *taskMCJ;
       //jet reconstruction for correction map
       if(bIsMap){ 
-        taskMCJ = AddTaskEmcalJet(sInputTrkMC.Data(),sUsedClus.Data(),iJetAlgo,aRadius[i],
-           iJetType);
-        
-        AliAnalysisTaskFlavourJetCorrelations *taskMCDmesonCJ = AddTaskFlavourJetCorrelations(
-           iCandType,
-           sCutFile,
-           kTRUE,
-           kFALSE,
-           taskMCJ->GetName(),
-           Form("JetR%s",sRadius[i].Data()),
-           iLeading,
-           leadHadType,
-           aRadius[i],
-           dJetPtCut,
-           acctype
-           /*percjetareacut=1.*/);
-        
-        taskMCDmesonCJ->SetName(Form("AliAnalysisTaskSEEmcalJetMCDmesonsCJ_%s",sRadius[i].Data()));
-        taskMCDmesonCJ->SetForceBeamType(uBeamType);
-        taskMCDmesonCJ->SetAnaType(uAnaType);
-        taskMCDmesonCJ->SetLeadingHadronType(iLeading);
-        //  taskDmesonCJ->SelectCollisionCandidates(uTriggerMask);
+       taskMCJ = AddTaskEmcalJet(sInputTrkMC.Data(),sUsedClus.Data(),iJetAlgo,aRadius[i], iJetType);
+
+       AddTaskDFilterAndCorrelations(
+                                     iCandType,
+                                     sCutFile,
+                                     bIsMC,
+                                     kFALSE,
+                                     sText,
+                                     taskFJ->GetName(),
+                                     iLeading,
+                                     leadHadType,
+                                     aRadius[i],
+                                     dJetPtCut,
+                                     acctype
+                                     //percjetareacut=1.
+                                     );
+
         
-        // definition of correction map
-        Int_t tag=0;
-        if(iCandType == 0) tag=AliEmcalJet::kD0;
-        if(iCandType == 1) tag=AliEmcalJet::kDStar;
-        Printf("************** tag = %d", tag&0x1);
-        AliJetResponseMaker* taskResp=AddTaskJetResponseMaker(
-           sUsedTrks.Data(),sUsedClus.Data(),taskFJ->GetName(),"",aRadius[i],
-           sInputTrkMC.Data(),"",taskMCJ->GetName(),"",aRadius[i],dJetPtCut,dJetAreaCut,5,0,AliJetResponseMaker::kGeometrical, 0.25,0.25,"TPC",-999,-999,-999,"AliJetResponseMaker", kFALSE, 0, -10,10, tag );
-        taskResp->SetMinJetMCPt(0); //added to bypass a return not needed (feature of PrepareJetTask)
-        //taskResp->SetHistoType(1);
+       // definition of correction map
+       Int_t tag=0;
+       if(iCandType == 0) tag=AliEmcalJet::kD0;
+       if(iCandType == 1) tag=AliEmcalJet::kDStar;
+       Printf("************** tag = %d", tag&0x1);
+       AliJetResponseMaker* taskResp=AddTaskJetResponseMaker(
+                                                             sUsedTrks.Data(),sUsedClus.Data(),taskFJ->GetName(),"",aRadius[i],
+                                                             sInputTrkMC.Data(),"",taskMCJ->GetName(),"",aRadius[i],dJetPtCut,dJetAreaCut,5,0,AliJetResponseMaker::kGeometrical, 0.25,0.25,"TPC",-999,-999,-999,"AliJetResponseMaker", kFALSE, 0, -10,10, tag );
+       taskResp->SetMinJetMCPt(0); //added to bypass a return not needed (feature of PrepareJetTask)
+       //taskResp->SetHistoType(1);
         
       }
    }