fixed GetNchBin

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskV2AllChAOD.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskV2AllChAOD.cxx
index a9feac7cecd765b2b72e72b84e207de8c8affc39..487514750102a58865551339713b580cc7365cd3 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskV2AllChAOD.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliAnalysisTaskV2AllChAOD.cxx
@@ -194,11 +194,11 @@ void AliAnalysisTaskV2AllChAOD::UserCreateOutputObjects()
   
   if( fFillTHn ){ 
     //dimensions of THnSparse for Q vector checks
-    const Int_t nvarev=7;
-    //                                             cent         q-rec_perc        qvec-rec      q-gen_tracks   qvec-gen_vzero             Nch      qrec-qgen
-    Int_t    binsHistRealEv[nvarev] = {     fnCentBins,              100,        fnQvecBins,     fnQvecBins,       fnQvecBins,     fnNchBins,       40};
-    Double_t xminHistRealEv[nvarev] = {             0.,               0.,                0.,             0.,               0.,            0.,      -2.};
-    Double_t xmaxHistRealEv[nvarev] = {           100.,             100.,     fQvecUpperLim,  fQvecUpperLim,    fQvecUpperLim,         2000.,       2.};
+    const Int_t nvarev=6;
+    //                                             cent         q-rec_perc        qvec-rec      q-gen_tracks   qvec-gen_vzero          Nch
+    Int_t    binsHistRealEv[nvarev] = {     fnCentBins,              100,        fnQvecBins,     fnQvecBins,       fnQvecBins,     fnNchBins};
+    Double_t xminHistRealEv[nvarev] = {             0.,               0.,                0.,             0.,               0.,            0.};
+    Double_t xmaxHistRealEv[nvarev] = {           100.,             100.,     fQvecUpperLim,  fQvecUpperLim,    fQvecUpperLim,         2000.};
     
     THnSparseF* NSparseHistEv = new THnSparseF("NSparseHistEv","NSparseHistEv",nvarev,binsHistRealEv,xminHistRealEv,xmaxHistRealEv);
     NSparseHistEv->GetAxis(0)->SetTitle(Form("%s cent",fEventCuts->GetCentralityMethod().Data()));
@@ -219,10 +219,6 @@ void AliAnalysisTaskV2AllChAOD::UserCreateOutputObjects()
     NSparseHistEv->GetAxis(5)->SetTitle("Ncharged");
     NSparseHistEv->GetAxis(5)->SetName("Nch");
     fOutput->Add(NSparseHistEv);
-    
-    NSparseHistEv->GetAxis(6)->SetTitle("#Delta q-vec");
-    NSparseHistEv->GetAxis(6)->SetName("Delta_qvec");
-    fOutput->Add(NSparseHistEv);
   }
   
   fCentrality = new TH1D("fCentrality", "centrality distribution; centrality", 200, 0., 100);
@@ -458,14 +454,11 @@ void AliAnalysisTaskV2AllChAOD::UserExec(Option_t *)
   if(!fEventCuts->IsSelected(fAOD,fTrackCuts))return;//event selection
   
   //Get q-vector percentile.
-  Double_t QvecVZERO=fEventCuts->GetQvecPercentile(fVZEROside);
-  
-  Double_t QvecMC = fEventCuts->GetQvecPercentileMC(fVZEROside, fQgenType);
-
   Double_t Qvec=0.;
-  if(fIsMC && fQvecGen) Qvec = QvecMC;
-  else Qvec = QvecVZERO;
+  if(fIsMC && fQvecGen) Qvec = fEventCuts->GetQvecPercentileMC(fVZEROside, fQgenType);
+  else Qvec = fEventCuts->GetQvecPercentile(fVZEROside);
 
+  
   Double_t Cent=(fDoCentrSystCentrality)?1.01*fEventCuts->GetCent():fEventCuts->GetCent();
   fCentrality->Fill(Cent);
   
@@ -674,26 +667,24 @@ void AliAnalysisTaskV2AllChAOD::UserExec(Option_t *)
     
   if( fFillTHn ){ 
 
+    
+    Double_t varEv[6];
+    varEv[0]=Cent;
+    varEv[1]=(Double_t)Qvec; // qvec_rec_perc
+    
     Double_t qvzero = 0.;
     if(fVZEROside==0)qvzero=(Double_t)fEventCuts->GetqV0A();
     else if (fVZEROside==1)qvzero=(Double_t)fEventCuts->GetqV0C(); // qvec_rec
-    
-    Double_t varEv[7];
-    varEv[0]=Cent;
-    varEv[1]=(Double_t)QvecVZERO; // qvec_rec_perc
     varEv[2]=(Double_t)qvzero; // qvec from VZERO
     
     Double_t qgen_tracks = (Double_t)fEventCuts->CalculateQVectorMC(fVZEROside, 0);
     varEv[3]= (Double_t)qgen_tracks;
     
-    Double_t qgen_vzero = fEventCuts->CalculateQVectorMC(fVZEROside, 1);
+    Double_t qgen_vzero = (Double_t)fEventCuts->CalculateQVectorMC(fVZEROside, 1);
     varEv[4]= (Double_t)qgen_vzero;
     
     varEv[5]=(Double_t)fEventCuts->GetNch(); // Nch
     
-    Double_t delta_q = qgen_tracks - qgen_vzero;
-    varEv[6]=(Double_t)delta_q;
-    
     ((THnSparseF*)fOutput->FindObject("NSparseHistEv"))->Fill(varEv);//event loop
 
   }
@@ -757,9 +748,6 @@ void  AliAnalysisTaskV2AllChAOD::MCclosure(Double_t qvec){
             if (!(partMC->IsPhysicalPrimary()))
                 continue;
             
-            if (partMC->Charge() == 0)
-                continue;
-
            if(partMC->Eta()<fTrackCuts->GetEtaMin() || partMC->Eta()>fTrackCuts->GetEtaMax()) continue;
          
            //Printf("a particle");

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx
index 8e4f57d04bf6a81d65b258f84e2d2066aad52cab..dc2ac10781d282abe9cf2ea38407fb8251867c26 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.cxx
@@ -665,7 +665,7 @@ Double_t AliSpectraAODEventCuts::GetQvecPercentile(Int_t v0side){
   
   if(fQvecCalibType==1){
     if(fNch<0.) return -999.;
-    ic = GetNchBin();
+    ic = GetNchBin(fQvecIntegral);
   } else ic = (Int_t)fCent; //fQvecIntegral: 1% centrality bin
   
   TH1D *h1D = (TH1D*)fQvecIntegral->ProjectionY("h1D",ic+1,ic+1);
@@ -879,7 +879,7 @@ Double_t AliSpectraAODEventCuts::GetQvecPercentileMC(Int_t v0side, Int_t type=1)
   
   if(fQvecCalibType==1){
     if(fNch<0.) return -999.;
-    ic = GetNchBin();
+    ic = GetNchBin(fQgenIntegral);
   } else ic = (Int_t)fCent; //fQvecIntegral: 1% centrality bin
   
   TH1D *h1D = (TH1D*)fQgenIntegral->ProjectionY("h1Dgen",ic+1,ic+1);
@@ -927,13 +927,13 @@ Bool_t AliSpectraAODEventCuts::CheckSplineArray(TObjArray * splarr, Int_t n){
 }
 
 //______________________________________________________
-Int_t AliSpectraAODEventCuts::GetNchBin(){
+Int_t AliSpectraAODEventCuts::GetNchBin(TH2D * h){
   
-  Double_t xmax = fQvecIntegral->GetXaxis()->GetXmax();
+  Double_t xmax = h->GetXaxis()->GetXmax();
   
-  if(fNch>xmax) return fQvecIntegral->GetNbinsX();
+  if(fNch>xmax) return (Int_t)h->GetNbinsX();
   
-  return (fNch*fQvecIntegral->GetNbinsX())/fQvecIntegral->GetXaxis()->GetXmax();
+  return (fNch*h->GetNbinsX())/h->GetXaxis()->GetXmax();
   
 }
 

diff --git a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h
index f38ce2529857d0726713baa0787d6cf4de8907f5..007465f5a4261cdf3660e1df5ebf308f0f90f387 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h
+++ b/PWGLF/SPECTRA/PiKaPr/TestAOD/AliSpectraAODEventCuts.h
@@ -171,7 +171,7 @@ class AliSpectraAODEventCuts : public TNamed
   Int_t GetNch() { return fNch; }
   
   void SetQVecCalibType(Int_t val) { fQvecCalibType=val; }  //0. centrality - 1. Nch
-  Int_t GetNchBin();
+  Int_t GetNchBin(TH2D * h);
   
   Double_t CalculateQVectorMC(Int_t v0side, Int_t type);
   Double_t GetQvecPercentileMC(Int_t v0side, Int_t type);