For pPb TRD analysis

diff --git a/PWGHF/hfe/macros/AddTaskHFEpPb.C b/PWGHF/hfe/macros/AddTaskHFEpPb.C
index d673e18e67e444dbdabda1d9dc4ffaf3b676f819..7fce9c960e1a2a7a6495804786380f0fa92ebf36 100644 (file)
--- a/PWGHF/hfe/macros/AddTaskHFEpPb.C
+++ b/PWGHF/hfe/macros/AddTaskHFEpPb.C
@@ -8,7 +8,8 @@ AliAnalysisTask *AddTaskHFEpPb(Bool_t MCthere = kFALSE,
                                Bool_t kITS_Sys = kFALSE,
                                Bool_t kTPCTOFTRD_Ref = kFALSE,
                                Bool_t kTPCTOFTRD_mbPID = kFALSE,
-                               Bool_t kTPCTOFTRD_PID = kFALSE,
+                              Bool_t kTPCTOFTRD_PID1 = kFALSE,
+                               Bool_t kTPCTOFTRD_PID2 = kFALSE,
                                int TRDtrigger = 0
   ){
   //get the current analysis manager
@@ -152,12 +153,20 @@ AliAnalysisTask *AddTaskHFEpPb(Bool_t MCthere = kFALSE,
     RegisterTaskPID2mbTRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,kDefTPCs,kDefTPCu,0,0,AliHFEextraCuts::kBoth,kFALSE,TRDtrigger,5,2,"TRD,TPC",etacut);
   }
 
-  if(kTPCTOFTRD_PID){
+  if(kTPCTOFTRD_PID1){
     // without TOF
-    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,5,4,"TRD,TPC");
-    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,5,4,"TPC,TRD");
-    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,6,4,"TRD,TPC");
-    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,6,4,"TPC,TRD");
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,1,5,4,"TRD,TPC");
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,1,5,4,"TPC,TRD");
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,1,6,4,"TRD,TPC");
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,1,6,4,"TPC,TRD");
+  }
+
+  if(kTPCTOFTRD_PID2){
+    // without TOF
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,2,5,4,"TRD,TPC");
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,2,5,4,"TPC,TRD");
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,2,6,4,"TRD,TPC");
+    RegisterTaskPID2TRD(MCthere,isAOD,kDefTPCcl,kDefTPCclPID,kDefITScl,kDefDCAr,kDefDCAz,&tpcl1[0],&dEdxhm[0],0,0,AliHFEextraCuts::kBoth,1,TRDtrigger,2,6,4,"TPC,TRD");
   }
 
   return NULL;
@@ -363,7 +372,7 @@ AliAnalysisTask *RegisterTaskPID2TRD(Bool_t useMC, Bool_t isAOD, Int_t tpcCls=12
                                     Double_t *tpcdEdxcuthigh=NULL,
                                     Double_t tofs=3., Int_t tofm=0,
                                     Int_t itshitpixel = AliHFEextraCuts::kBoth, Int_t icent=1,
-                                    Int_t TRDtrigger=0,Int_t trdl=6, Int_t trde=4,TString detector){
+                                    Int_t TRDtrigger=0,Int_t trdpidmethod=1, Int_t trdl=6, Int_t trde=4,TString detector){
 
   gROOT->LoadMacro("$ALICE_ROOT/PWGHF/hfe/macros/configs/pPb/ConfigHFEpPbTRD.C");
   AliAnalysisManager *mgr = AliAnalysisManager::GetAnalysisManager();
@@ -385,12 +394,12 @@ AliAnalysisTask *RegisterTaskPID2TRD(Bool_t useMC, Bool_t isAOD, Int_t tpcCls=12
   Int_t itofs = (Int_t)(tofs*10.);
   Int_t ipixelany = itshitpixel;
 
-  TString appendix(TString::Format("TPCc%dp%dITS%dr%dz%dTPCs%dTOFs%dm%ipa%dTRDt%dl%ie%i%sc%s",tpcCls,
-                   tpcClsPID,itsCls,idcaxy,idcaz,tpclow,itofs,tofm,ipixelany,TRDtrigger,trdl,trde,detused.Data(),cesti.Data()));
+  TString appendix(TString::Format("TPCc%dp%dITS%dr%dz%dTPCs%dTOFs%dm%ipa%dTRDt%dm%il%ie%i%sc%s",tpcCls,
+                   tpcClsPID,itsCls,idcaxy,idcaz,tpclow,itofs,tofm,ipixelany,TRDtrigger,trdpidmethod,trdl,trde,detused.Data(),cesti.Data()));
   printf("Add macro appendix %s\n", appendix.Data());
 
   AliAnalysisTaskHFE *task = ConfigHFEpPbTRD(useMC, isAOD, appendix, tpcCls, tpcClsPID, itsCls, dcaxy, dcaz,
-                             tpcdEdxcutlow,tpcdEdxcuthigh, tofs, tofm, itshitpixel, icent, -0.8, 0.8, TRDtrigger,trdl,trde,detector);
+                             tpcdEdxcutlow,tpcdEdxcuthigh, tofs, tofm, itshitpixel, icent, -0.8, 0.8, TRDtrigger,trdpidmethod,trdl,trde,detector);
 
   if(isAOD)
     task->SetAODAnalysis();

diff --git a/PWGHF/hfe/macros/configs/pPb/ConfigHFEpPbTRD.C b/PWGHF/hfe/macros/configs/pPb/ConfigHFEpPbTRD.C
index 0e02d7c075b34e20c626a007c96ea6714d8d5c02..b611c13d80b14b91e0a8b873f02cd0b28a798157 100644 (file)
--- a/PWGHF/hfe/macros/configs/pPb/ConfigHFEpPbTRD.C
+++ b/PWGHF/hfe/macros/configs/pPb/ConfigHFEpPbTRD.C
@@ -28,7 +28,7 @@ AliAnalysisTaskHFE* ConfigHFEpPbTRD(Bool_t useMC, Bool_t isAOD, TString appendix
                                 Double_t TOFs=3., Int_t TOFmis=0,
                                 Int_t itshitpixel = 0, Int_t icent=1,
                                 Double_t etami=-0.8, Double_t etama=0.8,
-                                Int_t TRDtrigger=1, Int_t TRDtl=6, Int_t TRDeff=4,
+                                Int_t TRDtrigger=1, Int_t trdpidmethod=1, Int_t TRDtl=6, Int_t TRDeff=4,
                                 TString detector){
   
     Bool_t kAnalyseTaggedTracks = kTRUE;
@@ -187,7 +187,7 @@ AliAnalysisTaskHFE* ConfigHFEpPbTRD(Bool_t useMC, Bool_t isAOD, TString appendix
 
   if(TRDtl>0){
       AliHFEpidTRD *trdpid = pid->GetDetPID(AliHFEpid::kTRDpid);
-      trdpid->SetTRD2DPID();
+      if(trdpidmethod==2) trdpid->SetTRD2DPID();
       trdpid->SetElectronEfficiency(eeff[TRDeff]);   // efficiency
       trdpid->SetNTracklets(TRDtl);      // ntracklets threshold
       trdpid->SetCutNTracklets(TRDtl, kTRUE);