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 43845b500e4e5471ccf90a03aa049beeda1bf2c9..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"
@@ -149,22 +152,6 @@ void AliEbyEPidRatioEffCont::CreateHistograms() {
   fHnEffRec->GetAxis(8)->SetTitle("#varphi_{Rec} (rad)");          //  phi  [ 0. , 2Pi]
   fHnEffRec->GetAxis(9)->SetTitle("#it{p}_{T,Rec} (GeV/#it{c})");  //  pt   [ 0.2, 2.3]
  
-
-  // fHnEff->GetAxis(0)->SetTitle("centrality");                   //  0-5|5-10|10-20|20-30|30-40|40-50|50-60|60-70|70-80|80-90 --> 10 bins
-  // fHnEff->GetAxis(1)->SetTitle("N_{ch}|N_{#pi}|N_{K}|N_{p}");                //  0 | 1 | 2 | 3
-  // fHnEff->GetAxis(2)->SetTitle("sign");                         //  -1 | 0 | +1 
-  // fHnEff->GetAxis(3)->SetTitle("findable");                     //  0 not findable      |  1 findable
-  // fHnEff->GetAxis(4)->SetTitle("recStatus");                    //  0 not reconstructed |  1 reconstructed
-  // fHnEff->GetAxis(5)->SetTitle("recPid");                       //  0 not accepted      |  1 accepted
-  // fHnEff->GetAxis(6)->SetTitle("#eta_{MC}-#eta_{Rec}");                      //  eta  [-0.9, 0.9]
-  // fHnEff->GetAxis(7)->SetTitle("#it{y}_{MC}-#it{y}_{Rec}");                  //  rapidity  [-0.5, 0.5]
-  // fHnEff->GetAxis(8)->SetTitle("#varphi_{MC}-#varphi_{Rec} (rad)");          //  phi  [ -2Pi , 2Pi]
-  // fHnEff->GetAxis(9)->SetTitle("#it{p}_{T,MC}-#it{p}_{T,Rec} (GeV/#it{c})"); //  pt   [ -2.3, 2.3]
-  //  fHnEff->GetAxis(10)->SetTitle("sign_{MC}-sign_{Rec}");                      //  -2 | 0 | +2 
-  
-  
-
- 
   fHelper->BinLogAxis(fHnEffMc, 9);
   fHelper->BinLogAxis(fHnEffRec, 9);
 
@@ -417,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);
    
@@ -473,6 +460,8 @@ void AliEbyEPidRatioEffCont::FillMCEffHist() {
     // -- Get if particle is findable --- not availible for AODs yet
     Float_t findable  = (fESD) ? Float_t(fHelper->IsParticleFindable(idxMC)) : 1.;
 
+    // cout << findable << "  " << fHelper->IsParticleFindable(idxMC)<< endl;
+
     // -- Get recStatus and pidStatus
     Float_t recStatus = 0.;
     Float_t recPid    = 0.;
@@ -524,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);