Merge branch 'master' of https://git.cern.ch/reps/AliRoot

diff --combined PWGPP/pid/AliAnalysisTaskK0sBayes.cxx
index 52f26be3eaff58052e5a2c06bae00b190d952f8e,f6d511471dcb78682de8e858200acb9119d36066..499ee6858e2e45f2eec1974cfeb5f8eff1fa7c8d
--- 1/PWGPP/pid/AliAnalysisTaskK0sBayes.cxx
--- 2/PWGPP/pid/AliAnalysisTaskK0sBayes.cxx
+++ b/PWGPP/pid/AliAnalysisTaskK0sBayes.cxx
@@@ -522,7 -522,8 +522,8 @@@ void AliAnalysisTaskK0sBayes::Analyze(A
    Double_t Qx2 = 0, Qy2 = 0;
    Double_t Qx3 = 0, Qy3 = 0;
    for(Int_t iT = 0; iT < ntrack; iT++) {
-     AliAODTrack* aodTrack = aodEvent->GetTrack(iT);
+     AliAODTrack* aodTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(iT));
+     if(!aodTrack) AliFatal("Not a standard AOD");
      
      if (!aodTrack){
        continue;
@@@ -556,7 -557,7 +557,7 @@@
  
    PIDResponse->SetTOFResponse(aodEvent,AliPIDResponse::kTOF_T0);
  
 -  PIDResponse->GetTOFResponse().SetTOFtailAllPara(-3,1.1);
 +  PIDResponse->GetTOFResponse().SetTOFtailAllPara(-23,1.1);
  
    fPIDCombined->SetDetectorMask(AliPIDResponse::kDetTPC|AliPIDResponse::kDetTOF);
  
@@@ -576,7 -577,8 +577,8 @@@
      nmc = mcArray->GetEntries();
  
    for(Int_t i=0;i < ntrack;i++){ // loop on tracks
-     AliAODTrack* track = aodEvent->GetTrack(i);
+     AliAODTrack* track = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(i));
+     if(!track) AliFatal("Not a standard AOD");
      
      AliAODMCParticle *mcp = NULL;
      Int_t pdg = 0;
@@@ -641,7 -643,8 +643,8 @@@
  
    // start analysis K0s
    for(Int_t i=0;i < ntrack;i++){ // loop on positive tracks
-     AliAODTrack* KpTrack = aodEvent->GetTrack(i);
+     AliAODTrack* KpTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(i));
+     if(!KpTrack) AliFatal("Not a standard AOD");
          
      if (!KpTrack){
        continue;
@@@ -770,7 -773,8 +773,8 @@@
      if(iks > -1 && fIpiN[iks] > -1){
        //for(Int_t j=0;j < ntrack;j++){ // loop on negative tracks
        Int_t j = fIpiN[iks];
-       AliAODTrack* KnTrack = aodEvent->GetTrack(j);
+       AliAODTrack* KnTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(j));
+       if(!KnTrack) AliFatal("Not a standard AOD");
        
        if (!KnTrack){
        continue;
@@@ -1041,7 -1045,8 +1045,8 @@@ void AliAnalysisTaskK0sBayes::SelectK0s
    // fill pion stacks
    Int_t nAODTracks = fOutputAOD->GetNumberOfTracks();
    for(Int_t iT = 0; iT < nAODTracks; iT++) { // loop on the tracks
-     AliAODTrack* aodTrack = fOutputAOD->GetTrack(iT);
+     AliAODTrack* aodTrack = dynamic_cast<AliAODTrack*>(fOutputAOD->GetTrack(iT));
+     if(!aodTrack) AliFatal("Not a standard AOD");
      
      if (!aodTrack){
        continue;
@@@ -1196,7 -1201,8 +1201,8 @@@ Int_t AliAnalysisTaskK0sBayes::FindDaug
    Int_t ntrack = fOutputAOD->GetNumberOfTracks();
  
    for(Int_t i=0;i < ntrack;i++){ // loop on tracks
-     AliAODTrack* track = fOutputAOD->GetTrack(i);
+     AliAODTrack* track = dynamic_cast<AliAODTrack*>(fOutputAOD->GetTrack(i));
+     if(!track) AliFatal("Not a standard AOD");
      if(track == trk) return i;
    }
    

diff --combined PWGPP/pid/AliAnalysisTaskLambdaBayes.cxx
index 1224be0db0418ddc9a4450c89c7acd5113a10783,a97f48b9f3a859eb43058318be24af6caf721f81..d79414c8a289379e8398bd507a916b17198c5456
--- 1/PWGPP/pid/AliAnalysisTaskLambdaBayes.cxx
--- 2/PWGPP/pid/AliAnalysisTaskLambdaBayes.cxx
+++ b/PWGPP/pid/AliAnalysisTaskLambdaBayes.cxx
@@@ -526,7 -526,8 +526,8 @@@ void AliAnalysisTaskLambdaBayes::Analyz
    Double_t Qx2 = 0, Qy2 = 0;
    Double_t Qx3 = 0, Qy3 = 0;
    for(Int_t iT = 0; iT < ntrack; iT++) {
-     AliAODTrack* aodTrack = aodEvent->GetTrack(iT);
+     AliAODTrack* aodTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(iT));
+     if(!aodTrack) AliFatal("Not a standard AOD");
      
      if (!aodTrack){
        continue;
@@@ -558,7 -559,7 +559,7 @@@
    AliInputEventHandler* inputHandler = (AliInputEventHandler*) (man->GetInputEventHandler());
    AliPIDResponse *PIDResponse=inputHandler->GetPIDResponse();
    PIDResponse->SetTOFResponse(aodEvent,AliPIDResponse::kTOF_T0);
 -  PIDResponse->GetTOFResponse().SetTOFtailAllPara(-3,1.1);
 +  PIDResponse->GetTOFResponse().SetTOFtailAllPara(-23,1.1);
  
  //   PIDResponse->GetTOFResponse().SetTrackParameter(0,0.);
  //   PIDResponse->GetTOFResponse().SetTrackParameter(1,0.);
@@@ -583,7 -584,8 +584,8 @@@
      nmc = mcArray->GetEntries();
  
    for(Int_t i=0;i < ntrack;i++){ // loop on tracks
-     AliAODTrack* track = aodEvent->GetTrack(i);
+     AliAODTrack* track = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(i));
+     if(!track) AliFatal("Not a standard AOD");
      
      AliAODMCParticle *mcp = NULL;
      Int_t pdg = 0;
@@@ -648,7 -650,8 +650,8 @@@
  
    // start analysis Lambda
    for(Int_t i=0;i < ntrack;i++){ // loop on proton candidate tracks
-     AliAODTrack* KpTrack = aodEvent->GetTrack(i);
+     AliAODTrack* KpTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(i));
+     if(!KpTrack) AliFatal("Not a standard AOD");
          
      if (!KpTrack){
        continue;
@@@ -783,7 -786,8 +786,8 @@@
      if(iks > -1 && fIpN[iks] > -1){
        //for(Int_t j=0;j < ntrack;j++){ // loop on negative tracks
        Int_t j = fIpN[iks];
-       AliAODTrack* KnTrack = aodEvent->GetTrack(j);
+       AliAODTrack* KnTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(j));
+       if(!KnTrack) AliFatal("Not a standard AOD");
        
        if (!KnTrack){
        continue;
@@@ -1103,7 -1107,8 +1107,8 @@@ Int_t AliAnalysisTaskLambdaBayes::FindD
    Int_t ntrack = fOutputAOD->GetNumberOfTracks();
  
    for(Int_t i=0;i < ntrack;i++){ // loop on tracks
-     AliAODTrack* track = fOutputAOD->GetTrack(i);
+     AliAODTrack* track = dynamic_cast<AliAODTrack*>(fOutputAOD->GetTrack(i));
+     if(!track) AliFatal("Not a standard AOD");
      if(track == trk) return i;
    }
    

diff --combined PWGPP/pid/AliAnalysisTaskPhiBayes.cxx
index 431ab56726a85b1d903fd6619d50385f4c8a6d4d,80312851cdea0de42423bed76719f847cb206880..eeaa0a0a28bd64c9bf83384a47b9125246d5a321
--- 1/PWGPP/pid/AliAnalysisTaskPhiBayes.cxx
--- 2/PWGPP/pid/AliAnalysisTaskPhiBayes.cxx
+++ b/PWGPP/pid/AliAnalysisTaskPhiBayes.cxx
@@@ -497,7 -497,8 +497,8 @@@ void AliAnalysisTaskPhiBayes::Analyze(A
    Double_t Qx2 = 0, Qy2 = 0;
    Double_t Qx3 = 0, Qy3 = 0;
    for(Int_t iT = 0; iT < ntrack; iT++) {
-     AliAODTrack* aodTrack = aodEvent->GetTrack(iT);
+     AliAODTrack* aodTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(iT));
+     if(!aodTrack) AliFatal("Not a standard AOD");
      
      if (!aodTrack){
        continue;
@@@ -529,7 -530,7 +530,7 @@@
    AliInputEventHandler* inputHandler = (AliInputEventHandler*) (man->GetInputEventHandler());
    AliPIDResponse *PIDResponse=inputHandler->GetPIDResponse();
    PIDResponse->SetTOFResponse(aodEvent,AliPIDResponse::kTOF_T0);
 -  PIDResponse->GetTOFResponse().SetTOFtailAllPara(-3,1.1);
 +  PIDResponse->GetTOFResponse().SetTOFtailAllPara(-23,1.1);
  
  //   PIDResponse->GetTOFResponse().SetTrackParameter(0,0.);
  //   PIDResponse->GetTOFResponse().SetTrackParameter(1,0.);
@@@ -553,7 -554,8 +554,8 @@@
      nmc = mcArray->GetEntries();
  
    for(Int_t i=0;i < ntrack;i++){ // loop on tracks
-     AliAODTrack* track = aodEvent->GetTrack(i);
+     AliAODTrack* track = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(i));
+     if(!track) AliFatal("Not a standard AOD");
      
      AliAODMCParticle *mcp = NULL;
      Int_t pdg = 0;
@@@ -618,7 -620,8 +620,8 @@@
  
    // start analysis phi
    for(Int_t i=0;i < ntrack;i++){ // loop on positive tracks
-     AliAODTrack* KpTrack = aodEvent->GetTrack(i);
+     AliAODTrack* KpTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(i));
+     if(!KpTrack) AliFatal("Not a standard AOD");
          
      if (!KpTrack){
        continue;
@@@ -741,7 -744,8 +744,8 @@@
      if(fPtKp > 4.299) fPtKp = 4.299;
  
      for(Int_t j=0;j < ntrack;j++){ // loop on negative tracks
-       AliAODTrack* KnTrack = aodEvent->GetTrack(j);
+       AliAODTrack* KnTrack = dynamic_cast<AliAODTrack*>(aodEvent->GetTrack(j));
+       if(!KnTrack) AliFatal("Not a standard AOD");
        
        if (!KnTrack){
        continue;