Changes to compile with Root6 on macosx64

[u/mrichter/AliRoot.git] / PWGLF / SPECTRA / ChargedHadrons / dNdPt / AlidNdPtAnalysispPb.cxx

diff --git a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysispPb.cxx b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysispPb.cxx
index 98650b12739a6f0541fa9cedb36d84417903c652..253771b5b90e0656e4987a6d6c74fd23e37148e8 100644 (file)
--- a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysispPb.cxx
+++ b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysispPb.cxx
@@ -1443,7 +1443,7 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
   
   Bool_t isTrigAndVertex = isEventTriggered && isEventOK;
   
-  Double_t vEventCount[3] = { (isEventTriggered && kTRUE) , isTrigAndVertex,  isTrigAndVertex && (TMath::Abs(vtxESD->GetZv()) < 10.)};
+  Double_t vEventCount[3] = { static_cast<Double_t>((isEventTriggered && kTRUE)) , static_cast<Double_t>(isTrigAndVertex), static_cast<Double_t>( isTrigAndVertex && (TMath::Abs(vtxESD->GetZv()) < 10.))};
   fEventCount->Fill(vEventCount);  
 
   // vertex contributors
@@ -1698,16 +1698,16 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
      Double_t vRecEventHist1[3] = {vtxESD->GetXv(),vtxESD->GetYv(),vtxESD->GetZv()};
      fRecEventHist1->Fill(vRecEventHist1);
 
-     Double_t vRecEventHist2[3] = {vtxESD->GetZv(),multMBTracks,multRecMult};
+     Double_t vRecEventHist2[3] = {vtxESD->GetZv(),static_cast<Double_t>(multMBTracks),static_cast<Double_t>(multRecMult)};
      fRecEventHist2->Fill(vRecEventHist2);
 
      // 
      //Double_t vRecEventHist[2] = {vtxESD->GetZv(),multMBTracks};
-     Double_t vRecEventHist[3] = {vtxESD->GetZv(),multMBTracks,centralityD};
+     Double_t vRecEventHist[3] = {vtxESD->GetZv(),static_cast<Double_t>(multMBTracks),centralityD};
      fRecEventHist->Fill(vRecEventHist);
           
      // fill fEventMultHist for cross checks
-     Double_t vEventMultHist[3] = {multMBTracks,multRecMult,multRec};
+     Double_t vEventMultHist[3] = {static_cast<Double_t>(multMBTracks),static_cast<Double_t>(multRecMult),static_cast<Double_t>(multRec)};
      fEventMultHist->Fill(vEventMultHist);
    } 
 
@@ -1734,7 +1734,7 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
        }
      }
 
-     Double_t vMultTrueEventMatrix[3] = { multRecMult, multMCTrueTracks, multMBTracks};
+     Double_t vMultTrueEventMatrix[3] = { static_cast<Double_t>(multRecMult), static_cast<Double_t>(multMCTrueTracks), static_cast<Double_t>(multMBTracks)};
      if(isEventOK && isEventTriggered) {   
        if(TMath::Abs(vtxMC[2]) < 10.0) // both Rec. and corresponding MC events must be accepted
          fEventMultCorrelationMatrix->Fill(vMultTrueEventMatrix);
@@ -1746,7 +1746,7 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
 
      // all inelastic
      //Double_t vEventMatrix[2] = {vtxMC[2],multMBTracks};
-     Double_t vEventMatrix[3] = {vtxMC[2],multMCTrueTracks,centralityD};
+     Double_t vEventMatrix[3] = {vtxMC[2],static_cast<Double_t>(multMCTrueTracks),centralityD};
      fGenEventMatrix->Fill(vEventMatrix); 
      if(isEventTriggered) fTriggerEventMatrix->Fill(vEventMatrix);
      if(isEventOK && isEventTriggered) fRecEventMatrix->Fill(vEventMatrix);
@@ -1810,7 +1810,7 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
        if(accCuts->AcceptTrack(particle)) 
        {
          //Double_t vTrackEventMatrix[3] = {vtxMC[2], particle->Pt(), particle->Eta()}; 
-        Double_t vTrackEventMatrix[4] = {vtxMC[2],particle->Pt(),particle->Eta(),multMCTrueTracks}; 
+        Double_t vTrackEventMatrix[4] = {vtxMC[2],particle->Pt(),particle->Eta(),static_cast<Double_t>(multMCTrueTracks)}; 
          fGenTrackEventMatrix->Fill(vTrackEventMatrix);
 
          if(evtType == AliPWG0Helper::kSD) {
@@ -1873,10 +1873,10 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
          Double_t vRecMCEventHist1[3] = {vtxESD->GetXv()-vtxMC[0],vtxESD->GetYv()-vtxMC[1],vtxESD->GetZv()-vtxMC[2]};
          fRecMCEventHist1->Fill(vRecMCEventHist1);
 
-         Double_t vRecMCEventHist2[3] = {vtxESD->GetXv()-vtxMC[0],vtxESD->GetZv()-vtxMC[2],multMBTracks};
+         Double_t vRecMCEventHist2[3] = {vtxESD->GetXv()-vtxMC[0],vtxESD->GetZv()-vtxMC[2],static_cast<Double_t>(multMBTracks)};
          fRecMCEventHist2->Fill(vRecMCEventHist2);
 
-         Double_t vRecMCEventHist3[2] = {multRec,evtType};
+         Double_t vRecMCEventHist3[2] = {static_cast<Double_t>(multRec),evtType};
          fRecMCEventHist3->Fill(vRecMCEventHist3);
        }
 
@@ -1921,7 +1921,7 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
 
            if( AlidNdPtHelper::IsPrimaryParticle(stack, iMc, GetParticleMode()) ) { 
             fGenPrimTrackMatrix->Fill(vTrackMatrix);
-            Double_t vMCPrimTrackHist[4] = {vtxMC[2],particle->Pt(),particle->Eta(),multMCTrueTracks}; 
+            Double_t vMCPrimTrackHist[4] = {vtxMC[2],particle->Pt(),particle->Eta(),static_cast<Double_t>(multMCTrueTracks)}; 
             fMCPrimTrackHist->Fill(vMCPrimTrackHist);
            }
           // fill control histograms
@@ -1942,7 +1942,7 @@ void AlidNdPtAnalysispPb::Process(AliESDEvent *const esdEvent, AliMCEvent *const
                  // fill control histogram
                  if(fHistogramsOn) {
                    Int_t pid = AlidNdPtHelper::ConvertPdgToPid(particle);
-                   Double_t vMCMultRecTrackHist1[3] = {particle->Pt(), particle->Eta(), pid};
+                   Double_t vMCMultRecTrackHist1[3] = {particle->Pt(), particle->Eta(), static_cast<Double_t>(pid)};
                   fMCMultRecTrackHist1->Fill(vMCMultRecTrackHist1);
                 }
               }
@@ -2010,19 +2010,19 @@ void AlidNdPtAnalysispPb::FillHistograms(TObjArray *const allChargedTracks,Int_t
      Int_t label = TMath::Abs(track->GetLabel());
      for(Int_t iAll=0; iAll<multAll; ++iAll) {
        if(label == labelsAll[iAll]) {
-         Double_t v1[2] = {track->Pt(), multAll}; 
+         Double_t v1[2] = {track->Pt(), static_cast<Double_t>(multAll)}; 
          fRecTrackMultHist1[AlidNdPtHelper::kAllTracks]->Fill(v1);
        }
      }
      for(Int_t iAcc=0; iAcc<multAcc; ++iAcc) {
        if(label == labelsAcc[iAcc]) {
-         Double_t v2[2] = {track->Pt(), multAcc}; 
+         Double_t v2[2] = {track->Pt(), static_cast<Double_t>(multAcc)}; 
          fRecTrackMultHist1[AlidNdPtHelper::kAccTracks]->Fill(v2);
        }
      }
      for(Int_t iRec=0; iRec<multRec; ++iRec) {
        if(label == labelsRec[iRec]) {
-         Double_t v3[2] = {track->Pt(), multRec}; 
+         Double_t v3[2] = {track->Pt(), static_cast<Double_t>(multRec)}; 
          fRecTrackMultHist1[AlidNdPtHelper::kRecTracks]->Fill(v3);
        }
      }
@@ -2057,7 +2057,7 @@ void AlidNdPtAnalysispPb::FillHistograms(AliESDtrack *const esdTrack, AliStack *
   Double_t values1[3] = {pt,eta,phi};    
   fRecTrackHist1[trackObj]->Fill(values1);
 
-  Double_t values[4] = {zv, pt,eta, multRecMult};        
+  Double_t values[4] = {zv, pt,eta, static_cast<Double_t>(multRecMult)};         
   if(trackObj == AlidNdPtHelper::kRecTracks) {
     fRecTrackHist->Fill(values);
   }
@@ -2171,8 +2171,8 @@ void AlidNdPtAnalysispPb::FillHistograms(AliStack *const stack, Int_t label, Ali
   Double_t vMCTrackHist1[3] = {gpt,geta,gphi};
   fMCTrackHist1[trackObj]->Fill(vMCTrackHist1);
 
-  Double_t vMCPrimTrackHist1[5] = {gpt,geta,pid,mech,motherPdg};
-  Double_t vMCPrimTrackHist2[5] = {TMath::Abs(particle->GetPdgCode()),mech,motherPdg};
+  Double_t vMCPrimTrackHist1[5] = {gpt,geta,static_cast<Double_t>(pid),static_cast<Double_t>(mech),static_cast<Double_t>(motherPdg)};
+  Double_t vMCPrimTrackHist2[5] = {static_cast<Double_t>(TMath::Abs(particle->GetPdgCode())),static_cast<Double_t>(mech),static_cast<Double_t>(motherPdg)};
   //if(prim && AliPWG0Helper::IsPrimaryCharged(particle, label)) fMCPrimTrackHist1[trackObj]->Fill(vMCPrimTrackHist1);
   if(prim) { 
     fMCPrimTrackHist1[trackObj]->Fill(vMCPrimTrackHist1);