]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Update from Nirbhay Higher Moment Study
authorsjena <sjena@cern.ch>
Thu, 19 Jun 2014 07:02:06 +0000 (09:02 +0200)
committersjena <sjena@cern.ch>
Thu, 19 Jun 2014 07:02:06 +0000 (09:02 +0200)
PWGCF/EBYE/Fluctuations/AliEbyEHigherMomentsEffContTask.cxx
PWGCF/EBYE/Fluctuations/AliHigherMomentsToyModel.cxx

index 3e4d6d86192a4acab92abf2b4e2929b1949e7832..abfe26dc1c5fc8c5ce6ffe2c9c0952f1152e8469 100644 (file)
@@ -552,8 +552,8 @@ void AliEbyEHigherMomentsEffContTask::doAODEvent(){
   
   
   
-  Double_t fContainerCh[3] = { fCentrality, nPlusCharge, nMinusCharge};
-  Double_t fContainerPid[3] = { fCentrality, nPartile, nAntiParticle};
+  Double_t fContainerCh[3] = { static_cast<Double_t>(fCentrality), nPlusCharge, nMinusCharge};
+  Double_t fContainerPid[3] = { static_cast<Double_t>(fCentrality), nPartile, nAntiParticle};
   
   if( fUsePid ){
     
@@ -803,8 +803,8 @@ void AliEbyEHigherMomentsEffContTask::doMCAODEvent(){
   
   //cout << "nCentrality "<< fCentrality <<", nParticle="<< nPartile << ", nMinusParticle=" << nAntiParticle << endl; 
   
-  Double_t fContainerCh[3] = { fCentrality, nPlusCharge, nMinusCharge};
-  Double_t fContainerPid[3] = { fCentrality, nPartile, nAntiParticle};
+  Double_t fContainerCh[3] = { static_cast<Double_t>(fCentrality), nPlusCharge, nMinusCharge};
+  Double_t fContainerPid[3] = { static_cast<Double_t>(fCentrality), nPartile, nAntiParticle};
   
   if( fUsePid ){
     
@@ -957,7 +957,7 @@ void AliEbyEHigherMomentsEffContTask::FillEffSparse(){
     
     //Fill ThnSparse----
     
-    Double_t EffContainer[15] = {fCentrality, partMC->Eta(), partMC->Y(), partMC->Phi(), partMC->Pt(), sign,findable, recStatus, recPid, etaRec, phiRec, ptRec, partMC->Eta()-etaRec, partMC->Phi()-phiRec, partMC->Pt()-ptRec};
+    Double_t EffContainer[15] = {static_cast<Double_t>(fCentrality), partMC->Eta(), partMC->Y(), partMC->Phi(), partMC->Pt(), static_cast<Double_t>(sign),static_cast<Double_t>(findable), static_cast<Double_t>(recStatus), static_cast<Double_t>(recPid), static_cast<Double_t>(etaRec), static_cast<Double_t>(phiRec), static_cast<Double_t>(ptRec), partMC->Eta()-etaRec, partMC->Phi()-phiRec, partMC->Pt()-ptRec};
     
     fTHnEff->Fill(EffContainer);   
     
@@ -1038,7 +1038,7 @@ void AliEbyEHigherMomentsEffContTask::CheckContTrackAOD(Int_t label, Float_t sig
   }    
   
   // -- Fill THnSparse
-  Double_t ContContainer[14] = { fCentrality, particle->Eta(), particle->Y(), particle->Phi(), particle->Pt(), sign, contPart, contSign, etaRec, phiRec, ptRec, particle->Eta()-etaRec, particle->Phi()-phiRec, particle->Pt()-ptRec };
+  Double_t ContContainer[14] = { static_cast<Double_t>(fCentrality), particle->Eta(), particle->Y(), particle->Phi(), particle->Pt(), static_cast<Double_t>(sign), static_cast<Double_t>(contPart), static_cast<Double_t>(contSign), static_cast<Double_t>(etaRec), static_cast<Double_t>(phiRec), static_cast<Double_t>(ptRec), particle->Eta()-etaRec, particle->Phi()-phiRec, particle->Pt()-ptRec };
   
   fTHnCont->Fill(ContContainer);
   
index 53f86601c8b41a77c8099d72e0a8f9d9fee782ef..ea81e8ba8a5a9d12c6cb2a2b72b4d5210b6770e1 100644 (file)
@@ -486,8 +486,8 @@ void AliHigherMomentsToyModel::doAODEvent(){
   
   
   
-  Double_t fContainerCh[3] = { fCentrality, nPlusCharge, nMinusCharge};
-  Double_t fContainerPid[3] = { fCentrality, nPartile, nAntiParticle};
+  Double_t fContainerCh[3] = { static_cast<Double_t>(fCentrality), nPlusCharge, nMinusCharge};
+  Double_t fContainerPid[3] = { static_cast<Double_t>(fCentrality), nPartile, nAntiParticle};
   
   
   fTHnCentNplusNminusCh->Fill(fContainerCh);
@@ -722,8 +722,8 @@ void AliHigherMomentsToyModel::doMCAODEvent(){
   
   //cout << "nCentrality "<< fCentrality <<", nParticle="<< nPartile << ", nMinusParticle=" << nAntiParticle << endl; 
   
-  Double_t fContainerCh[3] = { fCentrality, nPlusCharge, nMinusCharge};
-  Double_t fContainerPid[3] = { fCentrality, nPartile, nAntiParticle};
+  Double_t fContainerCh[3] = { static_cast<Double_t>(fCentrality), nPlusCharge, nMinusCharge};
+  Double_t fContainerPid[3] = { static_cast<Double_t>(fCentrality), nPartile, nAntiParticle};
   
   fTHnCentNplusNminusCh->Fill(fContainerCh);  
   
@@ -775,8 +775,8 @@ void AliHigherMomentsToyModel::doMCAODEvent(){
   
   }//MC-Truth Track loop--
   
-  Double_t fContainerChTruth[3] = { fCentrality, nPlusChargeTruth, nMinusChargeTruth };
-  Double_t fContainerPidTruth[3] = { fCentrality, nPartileTruth, nAntiParticleTruth };
+  Double_t fContainerChTruth[3] = { static_cast<Double_t>(fCentrality), nPlusChargeTruth, nMinusChargeTruth };
+  Double_t fContainerPidTruth[3] = { static_cast<Double_t>(fCentrality), nPartileTruth, nAntiParticleTruth };
   
   //cout << "Cent=" << fCentrality << " MC-PlusChrgT=" << nPlusChargeTruth << " MC-MinusChrgT=" << nMinusChargeTruth << endl;