new macros for Kaon Femto in pPb

diff --git a/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/AddTaskFemto.C b/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/AddTaskFemto.C
index 8c49206d11410f22ac2e2b479f1336118df7fd7f..983bca74876aae69efdf4cde91429b8a789d8603 100644 (file)
--- a/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/AddTaskFemto.C
+++ b/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/AddTaskFemto.C
@@ -55,7 +55,14 @@ AliAnalysisTaskFemto *AddTaskFemto(TString configMacroName, const char *containe
   //in $ALICE_ROOT/PWGCF/FEMTOSCOPY/macros/Train/
   //[root@alicethinks Train]# ln -s /scratch/AliWork/PbPb2.76/Train2013/KchHBT KchHBT
   //
+<<<<<<< HEAD
   AliAnalysisTaskFemto *taskfemto = new AliAnalysisTaskFemto("TaskFemto","$ALICE_ROOT/"+configMacroName,configMacroParameters,kFALSE);
+=======
+  //Train:
+  AliAnalysisTaskFemto *taskfemto = new AliAnalysisTaskFemto("TaskFemto","$ALICE_ROOT/"+configMacroName,configMacroParameters,kFALSE);
+  //Local:
+  //AliAnalysisTaskFemto *taskfemto = new AliAnalysisTaskFemto("TaskFemto",configMacroName,configMacroParameters,kFALSE);
+>>>>>>> new macros for Kaon Femto in pPb
   //10-90% only two triggers: SemiCentral and MB
   //taskfemto->SelectCollisionCandidates(AliVEvent::kMB | AliVEvent::kSemiCentral);// this a new line for train
   taskfemto->SelectCollisionCandidates(AliVEvent::kINT7);
@@ -63,6 +70,12 @@ AliAnalysisTaskFemto *AddTaskFemto(TString configMacroName, const char *containe
   //taskfemto->SelectCollisionCandidates(AliVEvent::kMB | AliVEvent::kCentral | AliVEvent::kSemiCentral);// this a new line for train
   mgr->AddTask(taskfemto);
 
+<<<<<<< HEAD
+=======
+  //MC PID (not needed for data):
+  AliAnalysisTaskSE *pidresponse = AddTaskPIDResponse(kTRUE);
+
+>>>>>>> new macros for Kaon Femto in pPb
   // D. Configure the analysis task. Extra parameters can be used via optional
   // arguments of the AddTaskXXX() function.
   //===========================================================================

diff --git a/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/ConfigFemtoAnalysis.C b/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/ConfigFemtoAnalysis.C
index 669e73fbc8b6f9abb88cc3df881b153d945df4b4..50a604ba5460dddc0f230792bf248c8a24f36967 100644 (file)
--- a/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/ConfigFemtoAnalysis.C
+++ b/PWGCF/FEMTOSCOPY/macros/Train/MC_KK_pPb_V0M/ConfigFemtoAnalysis.C
@@ -92,7 +92,12 @@ AliFemtoManager* ConfigFemtoAnalysis() {
   else shqmax = 2.0;
 
   AliFemtoEventReaderAODChain *Reader = new AliFemtoEventReaderAODChain();
+<<<<<<< HEAD
   Reader->SetUseMultiplicity(AliFemtoEventReaderAODChain::kCentralityV0);
+=======
+  //V0M estimator:
+  Reader->SetUseMultiplicity(AliFemtoEventReaderAODChain::kCentrality);
+>>>>>>> new macros for Kaon Femto in pPb
   Reader->SetFilterBit(7);
   Reader->SetpA2013(kTRUE);
   //Reader->SetUseMultiplicity(AliFemtoEventReaderAODChain::kCentralityV0A);