- Proper handling of tuneOnData mask for TPC PID response in case of MC

diff --git a/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx b/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
index 399e146a5d3f95eb0976c8827e7a5d24e74e36ee..677d4c0d1af6d73d42be3b2aeec6bf91a8533dbb 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskIDFragmentationFunction.cxx
@@ -2699,6 +2699,7 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
     (char*)__FILE__,__LINE__,nTCutsEfficiency,nRecPartCutsEfficiency);
   
   AliPIDResponse* pidResponse = 0x0;
+  Bool_t tuneOnDataTPC = kFALSE;
   if (fUseJetPIDtask || fUseInclusivePIDtask) {
     if (!inputHandler) {
       AliFatal("Input handler needed");
@@ -2711,6 +2712,10 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
         AliFatal("PIDResponse object was not created");
         return;
       }
+      else {
+        tuneOnDataTPC = pidResponse->IsTunedOnData() &&
+                        ((pidResponse->GetTunedOnDataMask() & AliPIDResponse::kDetTPC) == AliPIDResponse::kDetTPC);
+      }
     }
   }
   
@@ -2784,8 +2789,8 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
           // fill inclusive tracks XXX, they have the same track cuts!
           AliAODTrack * inclusiveaod  = dynamic_cast<AliAODTrack*>(fTracksRecCutsEfficiency->At(it));
           if(inclusiveaod){
-            Double_t dEdxTPC = pidResponse->IsTunedOnData() ? pidResponse->GetTPCsignalTunedOnData(inclusiveaod) 
-                                                            : inclusiveaod->GetTPCsignal();
+            Double_t dEdxTPC = tuneOnDataTPC ? pidResponse->GetTPCsignalTunedOnData(inclusiveaod) 
+                                             : inclusiveaod->GetTPCsignal();
             
             if (dEdxTPC <= 0)
               continue;
@@ -2860,8 +2865,8 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
         AliAODTrack * inclusiveaod  = dynamic_cast<AliAODTrack*>(fTracksRecCuts->At(it));
         if(inclusiveaod){
           if(fUseInclusivePIDtask){
-            Double_t dEdxTPC = pidResponse->IsTunedOnData() ? pidResponse->GetTPCsignalTunedOnData(inclusiveaod)
-                                                            : inclusiveaod->GetTPCsignal();
+            Double_t dEdxTPC = tuneOnDataTPC ? pidResponse->GetTPCsignalTunedOnData(inclusiveaod)
+                                             : inclusiveaod->GetTPCsignal();
             
             if (dEdxTPC <= 0)
               continue;
@@ -3186,8 +3191,8 @@ void AliAnalysisTaskIDFragmentationFunction::UserExec(Option_t *)
       }
          
       if (fUseJetPIDtask) {
-        Double_t dEdxTPC = pidResponse->IsTunedOnData() ? pidResponse->GetTPCsignalTunedOnData(aodtrack)
-                                                        : aodtrack->GetTPCsignal();
+        Double_t dEdxTPC = tuneOnDataTPC ? pidResponse->GetTPCsignalTunedOnData(aodtrack)
+                                         : aodtrack->GetTPCsignal();
         
         if (dEdxTPC <= 0)
           continue;

diff --git a/PWGJE/UserTasks/AliAnalysisTaskPID.cxx b/PWGJE/UserTasks/AliAnalysisTaskPID.cxx
index 750597f191319f576d2e7be1d0a157d155934160..4c2b20ffecb290d0cf014c1b46aa5e24587050c2 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskPID.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskPID.cxx
@@ -978,7 +978,9 @@ void AliAnalysisTaskPID::UserExec(Option_t *)
     
     
     // Apply detector level track cuts
-    Double_t dEdxTPC = fPIDResponse->IsTunedOnData() ? fPIDResponse->GetTPCsignalTunedOnData(track) : track->GetTPCsignal();
+    const Bool_t tuneOnDataTPC = fPIDResponse->IsTunedOnData() &&
+                                 ((fPIDResponse->GetTunedOnDataMask() & AliPIDResponse::kDetTPC) == AliPIDResponse::kDetTPC);
+    Double_t dEdxTPC = tuneOnDataTPC ? fPIDResponse->GetTPCsignalTunedOnData(track) : track->GetTPCsignal();
     if (dEdxTPC <= 0)
       continue;
     
@@ -2142,7 +2144,9 @@ Bool_t AliAnalysisTaskPID::ProcessTrack(const AliVTrack* track, Int_t particlePD
   Double_t trackCharge = track->Charge();
   
   // TPC signal
-  Double_t dEdxTPC = fPIDResponse->IsTunedOnData() ? fPIDResponse->GetTPCsignalTunedOnData(track) : track->GetTPCsignal();
+  const Bool_t tuneOnDataTPC = fPIDResponse->IsTunedOnData() &&
+                               ((fPIDResponse->GetTunedOnDataMask() & AliPIDResponse::kDetTPC) == AliPIDResponse::kDetTPC);
+  Double_t dEdxTPC = tuneOnDataTPC ? fPIDResponse->GetTPCsignalTunedOnData(track) : track->GetTPCsignal();
   
   if (dEdxTPC <= 0) {
     Printf("Skipping track with strange dEdx value: dEdx %f, pTPC %f, eta %f, ncl %d\n", track->GetTPCsignal(), pTPC,