Merge remote-tracking branch 'origin/master' into mergingFlat

accepted master versions of the jet stuff
conflict in AOD was trivial

Conflicts:
	PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
	PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
	STEER/AOD/AliAODTrack.cxx

diff --cc STEER/AOD/AliAODEvent.cxx
Simple merge

diff --cc STEER/AOD/AliAODEvent.h
index a4af17438cb20d15b3149240071fd5105e948f6e,8643acfeec5515e837d82a8a03c0d54e75b3dd2b..71533929c5c0ced389a4d0512888c548ffc17afd
--- 1/STEER/AOD/AliAODEvent.h
--- 2/STEER/AOD/AliAODEvent.h
+++ b/STEER/AOD/AliAODEvent.h
@@@ -158,10 -167,10 +167,12 @@@ class AliAODEvent : public AliVEvent 
    {new((*fVertices)[fVertices->GetEntriesFast()]) AliAODVertex(*vtx); return fVertices->GetEntriesFast()-1;}
    
    // primary vertex
 +  using AliVEvent::GetPrimaryVertex;
 +  using AliVEvent::GetPrimaryVertexSPD;
    virtual AliAODVertex *GetPrimaryVertex() const { return GetVertex(0); }
    virtual AliAODVertex *GetPrimaryVertexSPD() const;
+   virtual AliAODVertex *GetVertex() const { return GetPrimaryVertexSPD(); }
+   virtual AliAODVertex *GetPrimaryVertexTPC() const;
  
    // -- Pileup vertices 
    Int_t         GetNumberOfPileupVerticesTracks()   const;

diff --cc STEER/AOD/AliAODTrack.cxx
index 315399e3586d88e13dd5ea88071abd50650e57c1,8826e7c54187d8fb16aa13f9e077924c6c31a31f..acf6496e1fe90f551e75c7248c650c3864d4dd0f
--- 1/STEER/AOD/AliAODTrack.cxx
--- 2/STEER/AOD/AliAODTrack.cxx
+++ b/STEER/AOD/AliAODTrack.cxx
@@@ -1150,13 -1150,39 +1150,49 @@@ Double_t AliAODTrack::GetMassForTrackin
  const AliTOFHeader* AliAODTrack::GetTOFHeader() const {
    return fAODEvent->GetTOFHeader();
  }
- 
 +  
+ //_______________________________________________________
+ Int_t AliAODTrack::GetNcls(Int_t idet) const
+ {
+   // Get number of clusters by subdetector index
+   //
+   Int_t ncls = 0;
+   switch(idet){
+   case 0:
+     ncls = GetITSNcls();
+     break;
+   case 1:
+     ncls = (Int_t)GetTPCNcls();
+     break;
+   case 2:
+     ncls = (Int_t)GetTRDncls();
+     break;
+   case 3:
+     break;
+     /*if (fTOFindex != -1)
+       ncls = 1;*/
+     break;
+   case 4: //PHOS
+     break;
+   case 5: //HMPID
+     break;
+     if ((GetHMPIDcluIdx() >= 0) && (GetHMPIDcluIdx() < 7000000)) {
+       if ((GetHMPIDcluIdx()%1000000 != 9999) && (GetHMPIDcluIdx()%1000000 != 99999)) {
+       ncls = 1;
+       }
+     }    
+     break;
+   default:
+     break;
+   }
+   return ncls;
+ }
++
 +Int_t AliAODTrack::GetTrackParam         ( AliExternalTrackParam & ) const {return 0;} 
 +Int_t AliAODTrack::GetTrackParamRefitted ( AliExternalTrackParam & ) const {return 0;} 
 +Int_t AliAODTrack::GetTrackParamIp       ( AliExternalTrackParam & ) const {return 0;} 
 +Int_t AliAODTrack::GetTrackParamTPCInner ( AliExternalTrackParam & ) const {return 0;} 
 +Int_t AliAODTrack::GetTrackParamOp       ( AliExternalTrackParam & ) const {return 0;} 
 +Int_t AliAODTrack::GetTrackParamCp       ( AliExternalTrackParam & ) const {return 0;} 
 +Int_t AliAODTrack::GetTrackParamITSOut   ( AliExternalTrackParam & ) const {return 0;} 
 +

diff --cc STEER/AOD/AliAODTrack.h
Simple merge

diff --cc STEER/CMakelibSTEERBase.pkg
Simple merge

diff --cc STEER/ESD/AliESDEvent.cxx
Simple merge

diff --cc STEER/ESD/AliESDtrack.cxx
Simple merge

diff --cc STEER/ESD/AliESDtrack.h
Simple merge

diff --cc STEER/STEERBase/AliExternalTrackParam.h
Simple merge

diff --cc STEER/STEERBase/AliVVertex.h
Simple merge

diff --cc STEER/STEERBaseLinkDef.h
index 5fc559517f2729ae3eb681e2f575f073c07a6e4e,a3b1f248f622d1525b9ec201275607d81071671d..3be55b9dacb0c09517c593eeb60b620e556eae34
--- 1/STEER/STEERBaseLinkDef.h
--- 2/STEER/STEERBaseLinkDef.h
+++ b/STEER/STEERBaseLinkDef.h
@@@ -16,9 -16,8 +16,10 @@@
  #pragma link C++ class AliVCaloCells+;
  #pragma link C++ class AliVVertex+;
  #pragma link C++ class AliVEvent+;
 +#pragma link C++ class AliVfriendEvent+;
 +#pragma link C++ class AliVfriendTrack+;
  #pragma link C++ class AliVHeader+;
+ #pragma link C++ class AliVAODHeader+;
  #pragma link C++ class AliVEventHandler+;
  #pragma link C++ class AliVEventPool+;
  #pragma link C++ class AliVCuts+;