Merge branch 'master_patch'

diff --combined ANALYSIS/ESDfilter/AliAnalysisTaskESDfilter.cxx
index 5e1d52d88f1ef09bef518a263854c3d08bd2fafa,6870a5500211986a10d44805f367e86fbfea19d2..c3633881c124bf835d17464469381fdd31da0377
--- 1/ANALYSIS/ESDfilter/AliAnalysisTaskESDfilter.cxx
--- 2/ANALYSIS/ESDfilter/AliAnalysisTaskESDfilter.cxx
+++ b/ANALYSIS/ESDfilter/AliAnalysisTaskESDfilter.cxx
@@@ -367,8 -367,7 +367,8 @@@ AliAODHeader* AliAnalysisTaskESDfilter:
  
    AliCodeTimerAuto("",0);
    
 -  AliAODHeader* header = AODEvent()->GetHeader();
 +  AliAODHeader* header = dynamic_cast<AliAODHeader*>(AODEvent()->GetHeader());
 +  if(!header) AliFatal("Not a standard AOD");
    
    header->SetRunNumber(esd.GetRunNumber());
    header->SetOfflineTrigger(fInputHandler->IsEventSelected()); // propagate the decision of the physics selection
@@@ -600,7 -599,7 +600,7 @@@ void AliAnalysisTaskESDfilter::ConvertC
                                                                 vCascade,
                                                                 kTRUE,  // usedForVtxFit = kFALSE ? FIXME
                                                                 vtx->UsesTrack(esdCascadeBach->GetID()),
 -                                                               AliAODTrack::kSecondary,
 +                                                               AliAODTrack::kFromDecayVtx,
                                                                 selectInfo);
        aodTrack->SetPIDForTracking(esdCascadeBach->GetPIDForTracking());
        aodTrack->SetTPCFitMap(esdCascadeBach->GetTPCFitMap());
@@@ -681,7 -680,7 +681,7 @@@
                                                                   vV0FromCascade,
                                                                   kTRUE,  // usedForVtxFit = kFALSE ? FIXME
                                                                   vtx->UsesTrack(esdCascadePos->GetID()),
 -                                                                 AliAODTrack::kSecondary,
 +                                                                 AliAODTrack::kFromDecayVtx,
                                                                   selectInfo);
        aodTrack->SetPIDForTracking(esdCascadePos->GetPIDForTracking());
          aodTrack->SetTPCFitMap(esdCascadePos->GetTPCFitMap());
@@@ -733,7 -732,7 +733,7 @@@
                                                                   vV0FromCascade,
                                                                   kTRUE,  // usedForVtxFit = kFALSE ? FIXME
                                                                   vtx->UsesTrack(esdCascadeNeg->GetID()),
 -                                                                 AliAODTrack::kSecondary,
 +                                                                 AliAODTrack::kFromDecayVtx,
                                                                   selectInfo);
        aodTrack->SetPIDForTracking(esdCascadeNeg->GetPIDForTracking());
          aodTrack->SetTPCFitMap(esdCascadeNeg->GetTPCFitMap());
@@@ -950,7 -949,7 +950,7 @@@ void AliAnalysisTaskESDfilter::ConvertV
                                                                    vV0,
                                                                    kTRUE,  // check if this is right
                                                                    vtx->UsesTrack(esdV0Pos->GetID()),
 -                                                                  AliAODTrack::kSecondary,
 +                                                                  AliAODTrack::kFromDecayVtx,
                                                                    selectInfo);
            aodTrack->SetPIDForTracking(esdV0Pos->GetPIDForTracking());
            aodTrack->SetTPCFitMap(esdV0Pos->GetTPCFitMap());
@@@ -997,7 -996,7 +997,7 @@@
                                                              vV0,
                                                              kTRUE,  // check if this is right
                                                              vtx->UsesTrack(esdV0Neg->GetID()),
 -                                                            AliAODTrack::kSecondary,
 +                                                            AliAODTrack::kFromDecayVtx,
                                                              selectInfo);
        aodTrack->SetPIDForTracking(esdV0Neg->GetPIDForTracking());
        aodTrack->SetTPCFitMap(esdV0Neg->GetTPCFitMap());
@@@ -1781,7 -1780,7 +1781,7 @@@ void AliAnalysisTaskESDfilter::ConvertK
                                                                    vkink,
                                                                    kTRUE, // check if this is right
                                                                    vtx->UsesTrack(esdTrack->GetID()),
 -                                                                  AliAODTrack::kSecondary,
 +                                                                  AliAODTrack::kFromDecayVtx,
                                                                    selectInfo);
            daughter->SetPIDForTracking(esdTrackD->GetPIDForTracking());
              daughter->SetTPCFitMap(esdTrackD->GetTPCFitMap());
@@@ -1916,13 -1915,13 +1916,13 @@@ void AliAnalysisTaskESDfilter::ConvertT
    Int_t idxOfFirstPmtA = -1,       idxOfFirstPmtC = -1;
    Float_t timeOfFirstPmtA = 9999, timeOfFirstPmtC = 9999;
    for(int ipmt=0;  ipmt<12; ipmt++){
-     if( rawTime[ipmt] > -200 && rawTime[ipmt] < timeOfFirstPmtC && rawTime[ipmt]!=0){
+     if( rawTime[ipmt] > -2 && rawTime[ipmt] < timeOfFirstPmtC && rawTime[ipmt]!=0){
        timeOfFirstPmtC = rawTime[ipmt];
        idxOfFirstPmtC  = ipmt;
      }
    }
    for(int ipmt=12; ipmt<24; ipmt++){
-     if( rawTime[ipmt] > -200 && rawTime[ipmt] < timeOfFirstPmtA && rawTime[ipmt]!=0 ){
+     if( rawTime[ipmt] > -2 && rawTime[ipmt] < timeOfFirstPmtA && rawTime[ipmt]!=0 ){
        timeOfFirstPmtA = rawTime[ipmt];
        idxOfFirstPmtA  = ipmt;
      }