Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGCF / EBYE / PIDFluctuation / task / AliEbyEPidRatioEffCont.cxx

diff --git a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioEffCont.cxx b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioEffCont.cxx
index 5ed4702a501a41364be502de3c6b63bea4f6573a..153d5a71184c4693897ddefbd4b276125f44cb12 100644 (file)
--- a/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioEffCont.cxx
+++ b/PWGCF/EBYE/PIDFluctuation/task/AliEbyEPidRatioEffCont.cxx
@@ -21,6 +21,9 @@
 //                  Date: Wed Jul  9 18:38:30 CEST 2014                    //
 //          New approch to find particle ratio to reduce memory            //
 //                             (Test Only)                                 //
+//        Copied from NetParticle Classes
+//        Origin: Authors: Jochen Thaeder <jochen@thaeder.de>
+//                         Michael Weber <m.weber@cern.ch>
 //=========================================================================//
 
 #include "TMath.h"
@@ -401,8 +404,8 @@ void AliEbyEPidRatioEffCont::CheckContTrack(AliVTrack *track, Int_t iPid, Int_t
       deltaPhi -= TMath::TwoPi();
   }
 
-  Double_t hnContMc[8]  = {fCentralityBin,iPid,signMC,contPart,particle->Eta(),particle->Y(),particle->Phi(),particle->Pt()};
-  Double_t hnContRec[8] = {fCentralityBin,iPid,signRec,contPart, track->Eta(),yRec,track->Phi(),track->Pt()};
+  Double_t hnContMc[8]  = {fCentralityBin,static_cast<Double_t>(iPid),signMC,static_cast<Double_t>(contPart),particle->Eta(),particle->Y(),particle->Phi(),particle->Pt()};
+  Double_t hnContRec[8] = {fCentralityBin,static_cast<Double_t>(iPid),signRec,static_cast<Double_t>(contPart), track->Eta(),yRec,track->Phi(),track->Pt()};
   fHnContMc->Fill(hnContMc);
   fHnContRec->Fill(hnContRec);
    
@@ -510,13 +513,32 @@ void AliEbyEPidRatioEffCont::FillMCEffHist() {
     // if (signRec == 0) continue;
 
     if(iPid != 0) {
-      Double_t hnEffMc[10]  = {fCentralityBin,0,signMC,findable, recStatus,recPid,particle->Eta(), particle->Y(), particle->Phi(),particle->Pt()};
-      Double_t hnEffRec[10] = {fCentralityBin,0,signRec,findable, recStatus,recPid,etaRec, yRec, phiRec, ptRec};
+      Double_t hnEffMc[10]  = {fCentralityBin,0,
+                              static_cast<Double_t>(signMC),
+                              static_cast<Double_t>(findable), 
+                              static_cast<Double_t>(recStatus),
+                              static_cast<Double_t>(recPid),
+                              particle->Eta(), particle->Y(), particle->Phi(),particle->Pt()};
+      Double_t hnEffRec[10] = {fCentralityBin,0,
+                              static_cast<Double_t>(signRec),
+                              static_cast<Double_t>(findable), 
+                              static_cast<Double_t>(recStatus),
+                              static_cast<Double_t>(recPid),etaRec, yRec, phiRec, ptRec};
       fHnEffMc->Fill(hnEffMc);
       fHnEffRec->Fill(hnEffRec);
     }
-    Double_t hnEffMc[10]  = {fCentralityBin,iPid,signMC,findable, recStatus,recPid,particle->Eta(), particle->Y(), particle->Phi(),particle->Pt()};
-    Double_t hnEffRec[10] = {fCentralityBin,iPid,signRec,findable, recStatus,recPid,etaRec, yRec, phiRec, ptRec};
+    Double_t hnEffMc[10]  = {fCentralityBin,static_cast<Double_t>(iPid),
+                            static_cast<Double_t>(signMC),
+                            static_cast<Double_t>(findable), 
+                            static_cast<Double_t>(recStatus),
+                            static_cast<Double_t>(recPid),
+                            particle->Eta(), particle->Y(), particle->Phi(),particle->Pt()};
+    Double_t hnEffRec[10] = {fCentralityBin,
+                            static_cast<Double_t>(iPid),
+                            static_cast<Double_t>(signRec),
+                            static_cast<Double_t>(findable), 
+                            static_cast<Double_t>(recStatus),
+                            static_cast<Double_t>(recPid),etaRec, yRec, phiRec, ptRec};
     fHnEffMc->Fill(hnEffMc);
     fHnEffRec->Fill(hnEffRec);