Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGJE / UserTasks / AliAnalysisTaskJetShape.cxx

diff --git a/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx b/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx
index b2061ab32c8b57aae21433bdf6810073839f8a7f..a343f7ebd982fd8c814a1e1461bc75845799b0b0 100644 (file)
--- a/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx
+++ b/PWGJE/UserTasks/AliAnalysisTaskJetShape.cxx
@@ -1249,7 +1249,7 @@ void AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::InitHistos()
 
   fhPtJ      = Hist1D("hPtJ"  , fPtJetNbin, fPtJetArray.GetArray(), "Pt_{J} GeV/c");
   //  fhPsiVsR   = Hist1D("hPsiVsR", fPsiVsRNbin, 0., fRmax, "R", 1, "#Psi(R)");
-  fhPsiVsR   = Hist3D("hPsiVsR", fPsiVsRNbin, 0., fRmax, 10, 0., 1., fPtJetNbin, fPtJetArray.GetArray(), "R", "P_{Jt, frac}", "P_{J} GeV/c");
+  fhPsiVsR   = Hist3D("hPsiVsR", fPsiVsRNbin, 0., fRmax, 100, 0., 1., fPtJetNbin, fPtJetArray.GetArray(), "R", "P_{Jt, frac}", "P_{J} GeV/c");
   fhPsiVsRPtJ   = Hist2D("hPsiVsRPtJ", fPsiVsRNbin, 0., fRmax, fPtJetNbin, fPtJetArray.GetArray(), "R", "P_{tJ} GeV/c", 1, "#Psi(R)");
 
   fhPtJvsPtCorr  = Hist2D("fhPtJvsPtCorr", fPtJetNbin, fPtJetArray.GetArray(), 100, -100, 100, "P_{tJ} GeV/c", "P_{tJ} - P_{tJ,corr} GeV/c" , 1);
@@ -1271,7 +1271,8 @@ void AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::InitHistos()
 
   if(fkMCprod)
     {
-  fhPsiVsR_MCtr      = Hist1D("hPsiVsR_MCtr", fPsiVsRNbin, 0., fRmax, "R", 1, "#Psi(R)");
+  fhPsiVsR_MCtr      = Hist3D("hPsiVsR_MCtr", fPsiVsRNbin, 0., fRmax, 100, 0., 1., fPtJetNbin, fPtJetArray.GetArray(), "R", "P_{Jt, frac}", "P_{J} GeV/c");
+  //  fhPsiVsR_MCtr      = Hist1D("hPsiVsR_MCtr", fPsiVsRNbin, 0., fRmax, "R", 1, "#Psi(R)");
   fhPsiVsRPtJ_MCtr   = Hist2D("hPsiVsRPtJ_MCtr", fPsiVsRNbin, 0., fRmax, fPtJetNbin, fPtJetArray.GetArray(), "R", "P_{tJ} GeV/c", 1, "#Psi(R)");
   fhJetTrPtVsPartPt  = Hist2D("fhJetTrPtVsPartPt", fPtJetNbin, fPtJetArray.GetArray(), 100, -1, 1, "P_{tJ,part} GeV/c", "1-P_{tJ,tr}/P_{tJ,part} GeV/c" , 1);
   const char *ch[2]={"m","p"};
@@ -1379,8 +1380,8 @@ Bool_t AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::AddEvent(AliAODEvent*
 
   AliAODVertex* primVtx = aodE->GetPrimaryVertex();
   Double_t bfield = aodE->GetMagneticField();
-  Double_t dca[2];
-  Double_t cov[3];
+  Double_t dca[2] = {0., 0.};
+  Double_t cov[3] = {0., 0., 0.};
 
   TVector3 vecJ(jet->Px(),jet->Py(),jet->Pz());
 
@@ -1403,7 +1404,8 @@ Bool_t AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::AddEvent(AliAODEvent*
       }
     else 
       {
-       AliAODTrack *tr = aodE->GetTrack(it);
+       AliAODTrack *tr = dynamic_cast<AliAODTrack*>(aodE->GetTrack(it));
+       if(!tr) AliFatal("Not a standard AOD");
        if(!tr) continue;
        if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask)))continue;
        label = tr->GetLabel();
@@ -1504,7 +1506,8 @@ Bool_t AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::AddEvent(AliAODEvent*
        }
       else 
        {
-         AliAODTrack *tr = aodE->GetTrack(IndexArray[it]);
+         AliAODTrack *tr = dynamic_cast<AliAODTrack*>(aodE->GetTrack(IndexArray[it]));
+         if(!tr) AliFatal("Not a standard AOD");
          if(!tr) continue;
           AliAODTrack tmp(*tr);
           tmp.PropagateToDCA(primVtx, bfield, 5., dca, cov);
@@ -1540,11 +1543,11 @@ Bool_t AliAnalysisTaskJetShape::AliAnalysisTaskJetShapeHM::AddEvent(AliAODEvent*
          vec.SetXYZ(part->Px(), part->Py(), part->Pz());
 
          Double_t R = CalcR(fJvecMCtr, vec);
-         //      Double_t probL = fJvecMCtr.Dot(vec)/fJvecMCtr.Mag2();
+         Double_t probL = fJvecMCtr.Dot(vec)/fJvecMCtr.Mag2();
          //      fhPsiVsR->Fill(R, probL);
          //      fhPsiVsRPtJ->Fill(R, fPtJ, probL);
-         //      Double_t probL = fJvecMCtr.Dot(vec)/fJvecMCtr.Mag2();
-         fhPsiVsR_MCtr->Fill(R);
+         //Double_t probL = fJvecMCtr.Dot(vec)/fJvecMCtr.Mag2();
+         fhPsiVsR_MCtr->Fill(R,probL, fJvecMCtr.Mag());
          fhPsiVsRPtJ_MCtr->Fill(R, fPtJMCtr);
        }
     }
@@ -1928,7 +1931,7 @@ if(!aodH){
 
    if(fESD) {cent = fESD->GetCentrality();
      if(cent) centrality = cent->GetCentralityPercentile("V0M");}
-   else     centrality=aodE->GetHeader()->GetCentrality();
+   else     centrality=((AliVAODHeader*)aodE->GetHeader())->GetCentrality();
 
 
    if(!fkIsPbPb) {
@@ -2031,7 +2034,8 @@ if(!aodH){
 
       for(int it = 0;it < aodE->GetNumberOfTracks(); it++)
        {
-         AliAODTrack *tr = aodE->GetTrack(it);
+         AliAODTrack *tr = dynamic_cast<AliAODTrack*>(aodE->GetTrack(it));
+         if(!tr) AliFatal("Not a standard AOD");
          if(!tr) continue;
          if((fFilterMask>0)&&!(tr->TestFilterBit(fFilterMask))) continue;
          if(TMath::Abs(tr->Eta())>1.) continue;
@@ -2399,9 +2403,9 @@ Bool_t AnalysisJetMain::GetVertex(const AliESDEvent* esd,  Double_t Vxyz[3], Int
   }
 
  
-   Vxyz[0] = vtx->GetXv();
-   Vxyz[1] = vtx->GetYv();
-   Vxyz[2] = vtx->GetZv();
+   Vxyz[0] = vtx->GetX();
+   Vxyz[1] = vtx->GetY();
+   Vxyz[2] = vtx->GetZ();
  
    return kTRUE;
 }