Code reworking to analize ESD and AOD (H.Qvigstad)
authorkharlov <kharlov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 3 Aug 2012 16:09:34 +0000 (16:09 +0000)
committerkharlov <kharlov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 3 Aug 2012 16:09:34 +0000 (16:09 +0000)
PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.cxx
PWGGA/PHOSTasks/PHOS_PbPb/AliAnalysisTaskPi0Flow.h

index 114db0b..7be0e96 100644 (file)
 #include "AliAnalysisTaskPi0Flow.h"
 #include "AliCaloPhoton.h"
 #include "AliPHOSGeometry.h"
+#include "TGeoManager.h"
 #include "AliPHOSEsdCluster.h"
 #include "AliPHOSCalibData.h"
 #include "AliESDEvent.h"
 #include "AliESDCaloCells.h"
 #include "AliESDVertex.h"
 #include "AliESDtrackCuts.h"
+#include "AliAODEvent.h"
 #include "AliLog.h"
 #include "AliPID.h"
 #include "AliCDBManager.h"
-#include "AliCentrality.h" 
+#include <AliAODCaloCluster.h>
+#include "AliCentrality.h"
 #include "AliESDtrackCuts.h"
 #include "AliEventplane.h"
 #include "TProfile.h"
 #include "AliOADBContainer.h"
 
-// Analysis task to fill histograms with PHOS ESD clusters and cells
-// Authors: Dmitri Peressounko
-// Date   : 28.05.2011
+// Analysis task to fill histograms with PHOS ESD or AOD clusters and cells
+// Authors : Dmitri Peressounko
+// Date    : 28.05.2011
+// Modified: 03.08.2012 Henrik Qvigstad
 
-ClassImp(AliAnalysisTaskPi0Flow)
+ClassImp(AliAnalysisTaskPi0Flow);
 
 //________________________________________________________________________
 Double_t rnlin(Double_t *x, Double_t * /*par*/)
@@ -47,120 +51,132 @@ Double_t rnlin(Double_t *x, Double_t * /*par*/)
   //a = par[0], b = par[1].
   //1+a*exp(-e/b)
 
-// return 0.0241+1.0504*x[0]+0.000249*x[0]*x[0] ; 
- return 1.015*(0.0241+1.0504*x[0]+0.000249*x[0]*x[0]) ; 
+// return 0.0241+1.0504*x[0]+0.000249*x[0]*x[0] ;
+ return 1.015*(0.0241+1.0504*x[0]+0.000249*x[0]*x[0]) ;
 
 }
 
 //________________________________________________________________________
-AliAnalysisTaskPi0Flow::AliAnalysisTaskPi0Flow(const char *name) 
+AliAnalysisTaskPi0Flow::AliAnalysisTaskPi0Flow(const char *name, Period period)
 : AliAnalysisTaskSE(name),
-  fESDtrackCuts(0x0),
-  fStack(0x0),
+  fCentEdges(10),
+  fNEMRPBins(9),
+  fMixingArraysLength(100),
+  fPeriod(period),
   fOutputContainer(0x0),
-  fPHOSEvent(0x0),
-  fPHOSCalibData(0x0),
   fNonLinCorr(0),
+  fEvent(0x0),
+  fEventESD(0x0),
+  fEventAOD(0x0),
+  fMCStack(0x0),
+  fRunNumber(-999),
+  fInternalRunNumber(0),
+  fPHOSGeo(0),
+  fMultV0(0x0),
+  fV0Cpol(0.),fV0Apol(0.),
+  fESDtrackCuts(0x0),
+  fPHOSCalibData(0x0),
+  fVertexVector(),
+  fVtxBin(0),
+  fCentralityV0M(0.),
+  fCentBin(0),
+  fHaveTPCRP(0),
   fRP(0),
   fRPV0A(0),
   fRPV0C(0),
-  fHaveTPCRP(0),
-  fMultV0(0x0),
-  fV0Cpol(0.),fV0Apol(0.),
-  fRunNumber(0),
-  fCentrality(0.),
-  fCenBin(0),
-  fPHOSGeo(0),
-  fEventCounter(0)
+  fEMRPBin(0),
+  fCaloPhotonsPHOS(0x0),
+  fCaloPhotonsPHOSLists(0x0)
 {
-  // Constructor
-  for(Int_t i=0;i<1;i++){
-    for(Int_t j=0;j<10;j++)
-      for(Int_t k=0;k<11;k++)
-       fPHOSEvents[i][j][k]=0 ;
-  }
-  for(Int_t i=0;i<nCentrBinV0;i++){
+  const int elength = 10;
+  Double_t edges[elength] = {0., 5., 10., 20., 30., 40., 50., 60., 70., 80.};
+  fCentEdges = TArrayD(elength, edges);
+  
+  for(Int_t i=0;i<kNCenBins;i++){
     for(Int_t j=0;j<2; j++)
-      for(Int_t k=0; k<2; k++)
-        fMeanQ[i][j][k]=0. ;
+      for(Int_t k=0; k<2; k++) {
+        fMeanQ[i][j][k]=0.;
+       fWidthQ[i][j][k]=0.;
+      }
   }
   
+  fVertex[0]=0; fVertex[1]=0; fVertex[2]=0; 
+
   // Output slots #0 write into a TH1 container
   DefineOutput(1,TList::Class());
 
+
+
   // Set bad channel map
   char key[55] ;
   for(Int_t i=0; i<6; i++){
     snprintf(key,55,"PHOS_BadMap_mod%d",i) ;
     fPHOSBadMap[i]=new TH2I(key,"Bad Modules map",64,0.,64.,56,0.,56.) ;
   }
-  // Initialize the PHOS geometry
-  fPHOSGeo = AliPHOSGeometry::GetInstance("IHEP") ;
-
-  //We have to apply re-calibration for pass1 LCH10h
-  // Initialize decalibration factors in the form of the OCDB object
 
 
-  AliCDBManager * man = AliCDBManager::Instance();
-  man->SetRun(140000) ;
-  man->SetDefaultStorage("local://OCDB");
-  fPHOSCalibData = new AliPHOSCalibData();
-
   // Initialize non-linrarity correction
   fNonLinCorr = new TF1("nonlib",rnlin,0.,40.,0);
 
 
 }
-
+//___________________________________________________________________________
+AliAnalysisTaskPi0Flow::~AliAnalysisTaskPi0Flow()
+{
+  delete fNonLinCorr;
+  delete fESDtrackCuts;
+  delete fPHOSCalibData;
+  delete fCaloPhotonsPHOSLists;
+}
 //________________________________________________________________________
 void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
 {
   // Create histograms
   // Called once
   const Int_t nRuns=200 ;
-  
-  // ESD histograms
+
+  // histograms
   if(fOutputContainer != NULL){
     delete fOutputContainer;
   }
   fOutputContainer = new TList();
   fOutputContainer->SetOwner(kTRUE);
-  
+
   //========QA histograms=======
 
   //Event selection
-  fOutputContainer->Add(new TH2F("hSelEvents","Event selection", 10,0.,10.,nRuns,0.,float(nRuns))) ;
-  fOutputContainer->Add(new TH1F("hTotSelEvents","Event selection", 10,0.,10.)) ;
-  
+  fOutputContainer->Add(new TH2F("hSelEvents","Event selection", 12,0.,13.,nRuns,0.,float(nRuns))) ;
+  fOutputContainer->Add(new TH1F("hTotSelEvents","Event selection", 12,0.,12.)) ;
+
   //vertex distribution
   fOutputContainer->Add(new TH2F("hZvertex","Z vertex position", 50,-25.,25.,nRuns,0.,float(nRuns))) ;
-  
+
   //Centrality
   fOutputContainer->Add(new TH2F("hCentrality","Event centrality", 100,0.,100.,nRuns,0.,float(nRuns))) ;
   fOutputContainer->Add(new TH2F("hCenPHOS","Centrality vs PHOSclusters", 100,0.,100.,200,0.,200.)) ;
   fOutputContainer->Add(new TH2F("hCenPHOSCells","Centrality vs PHOS cells", 100,0.,100.,100,0.,1000.)) ;
-  fOutputContainer->Add(new TH2F("hCenTrack","Centrality vs tracks", 100,0.,100.,100,0.,15000.)) ;  
+  fOutputContainer->Add(new TH2F("hCenTrack","Centrality vs tracks", 100,0.,100.,100,0.,15000.)) ;
   fOutputContainer->Add(new TH2F("hCluEvsClu","ClusterMult vs E",200,0.,10.,100,0.,100.)) ;
-  
-  
+
+
   //Reaction plane
   fOutputContainer->Add(new TH3F("hPHOSphi","cos" ,10,0.,100.,20,0.,10.,100,-TMath::Pi(),TMath::Pi()));
-  
-   fOutputContainer->Add(new TH2F("cos2AC","RP correlation between TPC subs", 100,-1.,1.,20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("cos2V0AC","RP correlation between VO A and C sides", 100,-1.,1.,20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("cos2V0ATPC","RP correlation between TPC and V0A", 100,-1.,1.,20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("cos2V0CTPC","RP correlation between TPC and V0C", 100,-1.,1.,20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("phiRP","RP distribution with TPC", 100,0.,TMath::Pi(),20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("phiRPflat","RP distribution with TPC flat", 100,0.,TMath::Pi(),20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("phiRPV0A","RP distribution with V0A", 100,0.,TMath::Pi(),20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("phiRPV0C","RP distribution with V0C", 100,0.,TMath::Pi(),20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("phiRPV0Aflat","RP distribution with V0 flat", 100,0.,TMath::Pi(),20,0.,100.)) ;
-   fOutputContainer->Add(new TH2F("phiRPV0Cflat","RP distribution with V0 flat", 100,0.,TMath::Pi(),20,0.,100.)) ;
-   fOutputContainer->Add(new TH3F("phiRPV0ATPC","RP distribution with V0A + TPC", 100,0.,TMath::Pi(),100,0.,TMath::Pi(),20,0.,100.)) ;
-   fOutputContainer->Add(new TH3F("phiRPV0CTPC","RP distribution with V0C + TPC", 100,0.,TMath::Pi(),100,0.,TMath::Pi(),20,0.,100.)) ;
-  
-  
+
+  fOutputContainer->Add(new TH2F("cos2AC","RP correlation between TPC subs", 100,-1.,1.,20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("cos2V0AC","RP correlation between VO A and C sides", 100,-1.,1.,20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("cos2V0ATPC","RP correlation between TPC and V0A", 100,-1.,1.,20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("cos2V0CTPC","RP correlation between TPC and V0C", 100,-1.,1.,20,0.,100.)) ;
+
+  fOutputContainer->Add(new TH2F("phiRP","RP distribution with TPC", 100,0.,TMath::Pi(),20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("phiRPflat","RP distribution with TPC flat", 100,0.,TMath::Pi(),20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("phiRPV0A","RP distribution with V0A", 100,0.,TMath::Pi(),20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("phiRPV0C","RP distribution with V0C", 100,0.,TMath::Pi(),20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("phiRPV0Aflat","RP distribution with V0 flat", 100,0.,TMath::Pi(),20,0.,100.)) ;
+  fOutputContainer->Add(new TH2F("phiRPV0Cflat","RP distribution with V0 flat", 100,0.,TMath::Pi(),20,0.,100.)) ;
+  fOutputContainer->Add(new TH3F("phiRPV0ATPC","RP distribution with V0A + TPC", 100,0.,TMath::Pi(),100,0.,TMath::Pi(),20,0.,100.)) ;
+  fOutputContainer->Add(new TH3F("phiRPV0CTPC","RP distribution with V0C + TPC", 100,0.,TMath::Pi(),100,0.,TMath::Pi(),20,0.,100.)) ;
+
+
   //PHOS QA
   fOutputContainer->Add(new TH1I("hCellMultEvent"  ,"PHOS cell multiplicity per event"    ,2000,0,2000));
   fOutputContainer->Add(new TH1I("hCellMultEventM1","PHOS cell multiplicity per event, M1",2000,0,2000));
@@ -178,7 +194,7 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
   fOutputContainer->Add(new TH2F("hCellEXZM1","Cell E(X,Z), M1",64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCellEXZM2","Cell E(X,Z), M2",64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCellEXZM3","Cell E(X,Z), M3",64,0.5,64.5, 56,0.5,56.5));
-                         
+
   //Bad Map
   fOutputContainer->Add(new TH2F("hCluLowM1","Cell (X,Z), M1" ,64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCluLowM2","Cell (X,Z), M2" ,64,0.5,64.5, 56,0.5,56.5));
@@ -187,7 +203,7 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
   fOutputContainer->Add(new TH2F("hCluHighM1","Cell (X,Z), M1" ,64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCluHighM2","Cell (X,Z), M2" ,64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCluHighM3","Cell (X,Z), M3" ,64,0.5,64.5, 56,0.5,56.5));
-  
+
   fOutputContainer->Add(new TH2F("hCluVetoM1","Cell (X,Z), M1" ,64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCluVetoM2","Cell (X,Z), M2" ,64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCluVetoM3","Cell (X,Z), M3" ,64,0.5,64.5, 56,0.5,56.5));
@@ -196,14 +212,14 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
   fOutputContainer->Add(new TH2F("hCluDispM2","Cell (X,Z), M2" ,64,0.5,64.5, 56,0.5,56.5));
   fOutputContainer->Add(new TH2F("hCluDispM3","Cell (X,Z), M3" ,64,0.5,64.5, 56,0.5,56.5));
 
-  
+
   //Single photon and pi0 spectrum
-  Int_t nPtPhot = 300 ;
-  Double_t ptPhotMax = 30 ;
-  Int_t nM       = 500;
-  Double_t mMin  = 0.0;
-  Double_t mMax  = 1.0;
-    
+  const Int_t nPtPhot = 300 ;
+  const Double_t ptPhotMax = 30 ;
+  const Int_t nM       = 500;
+  const Double_t mMin  = 0.0;
+  const Double_t mMax  = 1.0;
+
   //PHOS calibration QA
   fOutputContainer->Add(new TH2F("hPi0M11","Pairs in modules",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
   fOutputContainer->Add(new TH2F("hPi0M12","Pairs in modules",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
@@ -211,9 +227,10 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
   fOutputContainer->Add(new TH2F("hPi0M22","Pairs in modules",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
   fOutputContainer->Add(new TH2F("hPi0M23","Pairs in modules",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
   fOutputContainer->Add(new TH2F("hPi0M33","Pairs in modules",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
-    
+
+  // Histograms for different centralities
   char key[55] ;
-  for(Int_t cent=0; cent<10; cent++){
+  for(Int_t cent=0; cent < fCentEdges.GetSize(); cent++){
     snprintf(key,55,"hPhotAll_cen%d",cent) ;
     fOutputContainer->Add(new TH1F(key,"All clusters",nPtPhot,0.,ptPhotMax));
     snprintf(key,55,"hPhotAllcore_cen%d",cent) ;
@@ -273,7 +290,7 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
     snprintf(key,55,"hPi0CPV2_a07_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"CPV clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
     snprintf(key,55,"hPi0Both_a07_cen%d",cent) ;
-    fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));        
+    fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
 
     snprintf(key,55,"hSingleAll_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"All clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
@@ -299,8 +316,8 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
     fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
     snprintf(key,55,"hSingleBothcore_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
-    
-    
+
+
     snprintf(key,55,"hMiPi0All_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"All clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
     snprintf(key,55,"hMiPi0Allcore_cen%d",cent) ;
@@ -325,7 +342,7 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
     fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
     snprintf(key,55,"hMiPi0Bothcore_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
-    
+
     snprintf(key,55,"hMiPi0All_a07_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"All clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
     snprintf(key,55,"hMiPi0Disp_a07_cen%d",cent) ;
@@ -335,7 +352,7 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
     snprintf(key,55,"hMiPi0CPV2_a07_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"CPV clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
     snprintf(key,55,"hMiPi0Both_a07_cen%d",cent) ;
-    fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));   
+    fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
 
     snprintf(key,55,"hMiSingleAll_cen%d",cent) ;
     fOutputContainer->Add(new TH2F(key,"All clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
@@ -363,16 +380,18 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
     fOutputContainer->Add(new TH2F(key,"Both clusters",nM,mMin,mMax,nPtPhot,0.,ptPhotMax));
   }
 
-  
 
-  Int_t nPt      = 20;
-  Double_t xPt[21]={0.6,1.,1.5,2.,2.5,3.,3.5,4.,4.5,5.,5.5,6.,7.,8.,9.,10.,12.,14.,16.,18.,20.} ;
-  Int_t nPhi=10 ;
-  Double_t xPhi[11] ;
-  for(Int_t i=0;i<=10;i++)xPhi[i]=i*0.1*TMath::Pi() ;
-  Int_t nMm=200 ;
-  Double_t xM[201] ;
-  for(Int_t i=0;i<=200;i++){xM[i]=0.0025*i;}
+
+  const Int_t nPt      = 20;
+  const Double_t xPt[21]={0.6,1.,1.5,2.,2.5,3.,3.5,4.,4.5,5.,5.5,6.,7.,8.,9.,10.,12.,14.,16.,18.,20.} ;
+  const Int_t nPhi=10 ;
+  Double_t xPhi[nPhi+1] ;
+  for(Int_t i=0;i<=nPhi;i++)
+    xPhi[i]=i*TMath::Pi() /nPhi ;
+  const Int_t nMm=200 ;
+  Double_t xM[nMm+1] ;
+  for(Int_t i=0;i<=nMm;i++)
+    xM[i]=i*0.5 /nMm;
 
   char phiTitle[15] ;
   for(Int_t iRP=0; iRP<3; iRP++){
@@ -382,246 +401,251 @@ void AliAnalysisTaskPi0Flow::UserCreateOutputObjects()
       snprintf(phiTitle,15,"V0A") ;
     if(iRP==2)
       snprintf(phiTitle,15,"V0C") ;
-  for(Int_t cent=0; cent<10; cent++){
-    snprintf(key,55,"hPhotPhi%sAll_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hPhotPhi%sAllcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hPhotPhi%sDisp_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hPhotPhi%sDispcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hPhotPhi%sCPV_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hPhotPhi%sCPVcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hPhotPhi%sBoth_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hPhotPhi%sBothcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
-
-    //Pions
-    snprintf(key,55,"hMassPt%sAll_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMassPt%sAllcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMassPt%sCPV_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMassPt%sCPVcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMassPt%sDisp_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMassPt%sDispcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMassPt%sBoth_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMassPt%sBothcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-        
-    //Mixed
-    snprintf(key,55,"hMiMassPt%sAll_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMiMassPt%sAllcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMiMassPt%sCPV_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMiMassPt%sCPVcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMiMassPt%sDisp_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMiMassPt%sDispcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMiMassPt%sBoth_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-    snprintf(key,55,"hMiMassPt%sBothcore_cen%d",phiTitle,cent) ;
-    fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
-  }
-  }
-
-  // Create ESD track cut
-  fESDtrackCuts = AliESDtrackCuts::GetStandardTPCOnlyTrackCuts() ;
-  fESDtrackCuts->SetRequireTPCRefit(kTRUE);
-
-//  fESDtrackCuts = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010();
+    for(Int_t cent=0; cent<fCentEdges.GetSize(); cent++){
+      snprintf(key,55,"hPhotPhi%sAll_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hPhotPhi%sAllcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hPhotPhi%sDisp_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hPhotPhi%sDispcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hPhotPhi%sCPV_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hPhotPhi%sCPVcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hPhotPhi%sBoth_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hPhotPhi%sBothcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH2F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nPt,xPt,nPhi,xPhi));
+
+      //Pions
+      snprintf(key,55,"hMassPt%sAll_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMassPt%sAllcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMassPt%sCPV_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMassPt%sCPVcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMassPt%sDisp_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMassPt%sDispcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMassPt%sBoth_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMassPt%sBothcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+
+      //Mixed
+      snprintf(key,55,"hMiMassPt%sAll_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMiMassPt%sAllcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMiMassPt%sCPV_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMiMassPt%sCPVcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMiMassPt%sDisp_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMiMassPt%sDispcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMiMassPt%sBoth_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+      snprintf(key,55,"hMiMassPt%sBothcore_cen%d",phiTitle,cent) ;
+      fOutputContainer->Add(new TH3F(key,"(M,p_{T},d#phi)_{#gamma#gamma}" ,nMm,xM,nPt,xPt,nPhi,xPhi));
+    }
+  }
+  
+  // Setup photon lists
+  Int_t kapacity = kNVtxZBins * GetNumberOfCentralityBins() * fNEMRPBins;
+  fCaloPhotonsPHOSLists = new TObjArray(kapacity);
+  fCaloPhotonsPHOSLists->SetOwner();
   
   PostData(1, fOutputContainer);
-
 }
 
 //________________________________________________________________________
-void AliAnalysisTaskPi0Flow::UserExec(Option_t *) 
+void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
 {
   // Main loop, called for each event
   // Analyze ESD/AOD
-    
-  fStack=0 ;
-  if(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler()){
-    if(static_cast<AliMCEventHandler*>(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler())->MCEvent())
-      fStack = static_cast<AliMCEventHandler*>(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler())->MCEvent()->Stack();
+
+
+  // Step 0: Event Objects
+  fEvent = GetEvent();
+  fEventESD = dynamic_cast<AliESDEvent*> (fEvent);
+  fEventAOD = dynamic_cast<AliAODEvent*> (fEvent);
+  fMCStack = GetMCStack();
+  LogProgress(0, ConvertToInternalRunNumber(fEvent->GetRunNumber()));
+
+
+  // Step 1: Run Number, Misalignment Matrix, and Calibration
+  // fRunNumber, fInternalRunNumber, fMultV0, fV0Cpol, fV0Apol, fMeanQ, fWidthQ
+  if( fRunNumber != fEvent->GetRunNumber()) { // Check run number
+    // this should run only at first call of UserExec(),
+    // or if task runs over multiple runs, which should not occur in normal use.
+
+    // if run number has changed, set run variables
+    fRunNumber = fEvent->GetRunNumber();
+    fInternalRunNumber = ConvertToInternalRunNumber(fRunNumber);
+    // then set misalignment and V0 calibration
+    SetGeometry();
+    SetMisalignment();
+    SetV0Calibration();
+    SetESDTrackCuts();
+    SetPHOSCalibData();
   }
-  
-  
-  AliESDEvent *event = dynamic_cast<AliESDEvent*>(InputEvent());
-  if (!event) {
-    Printf("ERROR: Could not retrieve event");
+  LogProgress(1, fInternalRunNumber);
+
+
+  // Step 2: Vertex
+  // fVertex, fVertexVector, fVtxBin
+  SetVertex();
+  if( RejectEventVertex() ) {
     PostData(1, fOutputContainer);
-    return;
+    return; // Reject!
   }
+  LogProgress(2, fInternalRunNumber);
 
-  fRunNumber=ConvertRunNumber(event->GetRunNumber()) ;
-  FillHistogram("hSelEvents",0.5,fRunNumber-0.5) ;
-  FillHistogram("hTotSelEvents",0.5) ;
-  
-  // Get PHOS rotation matrices from ESD and set them to the PHOS geometry
-  char skey[55] ;
-  if(fEventCounter == 0) {
-   OpenInfoCalbration(event->GetRunNumber()) ;
-   for(Int_t mod=0; mod<5; mod++) {
-      if(!event->GetPHOSMatrix(mod)) continue;
-      fPHOSGeo->SetMisalMatrix(event->GetPHOSMatrix(mod),mod) ;
-      Printf("PHOS geo matrix %p for module # %d is set\n", event->GetPHOSMatrix(mod), mod);
-    }
-    fEventCounter++ ;
-  }
+// Step 3:
+//   if(event->IsPileupFromSPD()){
+//     PostData(1, fOutputContainer);
+//     return; // Reject!
+//   }
+  LogProgress(3, fInternalRunNumber);
 
-  
-  // Checks if we have a primary vertex
-  // Get primary vertices form ESD
-  const AliESDVertex *esdVertex5 = event->GetPrimaryVertex();
 
-  Double_t vtx0[3] = {0,0,0}; // don't rely on ESD vertex, assume (0,0,0)
-  Double_t vtx5[3] ={0.,0.,0.};
-  
-  vtx5[0] = esdVertex5->GetX();
-  vtx5[1] = esdVertex5->GetY();
-  vtx5[2] = esdVertex5->GetZ();
-  
-  
-  FillHistogram("hZvertex",esdVertex5->GetZ(),fRunNumber-0.5);
-  if (TMath::Abs(esdVertex5->GetZ()) > 10. ){
+  // Step 4: Centrality
+  // fCentralityV0M, fCentBin
+  SetCentrality();
+  if( RejectCentrality() ){
     PostData(1, fOutputContainer);
-    return;
+    return; // Reject! 
   }
-  FillHistogram("hSelEvents",1.5,fRunNumber-0.5) ;
-  FillHistogram("hTotSelEvents",1.5) ;
+  LogProgress(4, fInternalRunNumber);
 
-/*  
-  if(event->IsPileupFromSPD()){
-    PostData(1, fOutputContainer);
-    return;
-  } 
-*/
-  FillHistogram("hSelEvents",2.5,fRunNumber-0.5) ;
-  FillHistogram("hTotSelEvents",2.5) ;  
+
+  // Step 5: Reaction Plane
+  // fHaveTPCRP, fRP, fRPV0A, fRPV0C, fRPBin
+  //EvalReactionPlane(); //TODO: uncomment this, or at least deal with it
+  //EvalV0ReactionPlane(); //TODO: uncomment this, or at least deal with it
+  //fRPBin = GetRPBin(); //TODO: uncomment this, or at least deal with it
+  LogProgress(5, fInternalRunNumber);
+
+
+  // Step 6: MC
+  //  ProcessMC() ;
+  LogProgress(6, fInternalRunNumber);
+
+
+  // Step 7: QA PHOS cells
+  FillPHOSCellQAHists();
+  LogProgress(7, fInternalRunNumber);
+
+
+  // Step 8: Event Photons (PHOS Clusters) selection
+  SelectPhotonClusters();
+  FillSelectedClusterHistograms();
+  LogProgress(8, fInternalRunNumber);
+
+  // Step 9: Consider pi0 (photon/cluster) pairs.
+  ConsiderPi0s();
+  LogProgress(9, fInternalRunNumber);
+
+  // Step 10; Mixing
+  ConsiderPi0sMix();
+  LogProgress(10, fInternalRunNumber);
   
+  // Step 11: Update lists
+  UpdateLists();
+  LogProgress(11,fInternalRunNumber);
+
   
-  /*
-  //Vtx class z-bin
-  Int_t zvtx = (Int_t)((vtx5[2]+10.)/2.) ;
-  if(zvtx<0)zvtx=0 ;
-  if(zvtx>9)zvtx=9 ;
-  */
-  //No dependence on zVtx observed, save memory
-  Int_t zvtx=0 ;
-
-  AliCentrality *centrality = event->GetCentrality(); 
-  fCentrality=centrality->GetCentralityPercentile("V0M");
-
-  if( fCentrality <= 0. || fCentrality>80. ){
-    PostData(1, fOutputContainer);
-    return;
-  }
+  // Post output data.
+  PostData(1, fOutputContainer);
+}
 
-  FillHistogram("hSelEvents",3.5,fRunNumber-0.5) ;
-  FillHistogram("hTotSelEvents",3.5) ;
+//________________________________________________________________________
+void AliAnalysisTaskPi0Flow::Terminate(Option_t *)
+{
+  // Draw result to the screen
+  // Called once at the end of the query
+  new TCanvas;
+  TH1 * hTotSelEvents = dynamic_cast<TH1*>(fOutputContainer->FindObject("hTotSelEvents"));
+  hTotSelEvents->Draw();
+}
+//________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetCentralityBinning(const TArrayD& edges)
+{
+  int last = edges.GetSize()-1;
+  if( edges.At(0) < 0.) 
+    AliError("lower edge less then 0");
+  if( 90. < edges.At(last)  )
+    AliError("upper edge larger then 90.");
+  for(int i=0; i<last-1; ++i)
+    if(edges.At(i) > edges.At(i+1))
+      AliError("edges are not sorted");
+  
+  fCentEdges = edges;
+}
 
-  fCenBin=1+Int_t(fCentrality/10.) ;
-  if(fCentrality<5.)
-    fCenBin=0 ;
-  if(fCenBin>9)
-    fCenBin=9 ;
+//________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetPHOSBadMap(Int_t mod, TH2I* badMapHist)
+  {
+    if(fPHOSBadMap[mod])
+      delete fPHOSBadMap[mod];
+
+    fPHOSBadMap[mod]=new TH2I(*badMapHist);
+    if(fDebug > 0)
+      AliInfo(Form("Setting Bad Map Histogram  %s",fPHOSBadMap[mod]->GetName()));
+  }
 
+//________________________________________________________________________
+Bool_t AliAnalysisTaskPi0Flow::IsGoodChannel(const char * det, Int_t mod, Int_t ix, Int_t iz)
+{
+  //Check if this channel belogs to the good ones
 
-  //reaction plane
-  AliEventplane *eventplane = event->GetEventplane();
-  Double_t rpFull = eventplane->GetEventplane("Q");
-  FillHistogram("phiRP",rpFull,fCentrality) ;
-  
-  if(rpFull==999 || rpFull < 0.){ //reaction plain was not defined
-    fHaveTPCRP = kFALSE ;
-    fRP=0. ;
+  if(strcmp(det,"PHOS")==0){
+    if(mod>5 || mod<1){
+      AliError(Form("No bad map for PHOS module %d",mod)) ;
+      return kTRUE ;
+    }
+    if(!fPHOSBadMap[mod]){
+      AliError(Form("No Bad map for PHOS module %d, !fPHOSBadMap[mod]",mod)) ;
+      return kTRUE ;
+    }
+    if(fPHOSBadMap[mod]->GetBinContent(ix,iz)>0)
+      return kFALSE ;
+    else
+      return kTRUE ;
   }
   else{
-    fHaveTPCRP = kTRUE ;    
-  }
-  if(fHaveTPCRP){
-    fRP = ApplyFlattening(rpFull,fCentrality) ;
-    while(fRP<0)fRP+=TMath::Pi() ;
-    while(fRP>TMath::Pi())fRP-=TMath::Pi() ;
-    FillHistogram("phiRPflat",fRP,fCentrality) ;  
-    Double_t dPsi=eventplane->GetQsubRes() ;
-    FillHistogram("cos2AC",TMath::Cos(2.*dPsi),fCentrality) ;
-  }
-  
-  EvalV0ReactionPlane(event) ;
-  FillHistogram("phiRPV0Aflat",fRPV0A,fCentrality) ;
-  FillHistogram("phiRPV0AC",fRPV0A,fRPV0C,fCentrality) ;
-  FillHistogram("cos2V0AC",TMath::Cos(2.*(fRPV0A-fRPV0C)),fCentrality) ;
-  if(fHaveTPCRP){
-    FillHistogram("phiRPV0ATPC",fRP,fRPV0A,fCentrality) ;
-    FillHistogram("cos2V0ATPC",TMath::Cos(2.*(fRP-fRPV0A)),fCentrality) ;
+    AliError(Form("Can not find bad channels for detector %s ",det)) ;
   }
-  
-  FillHistogram("phiRPV0Cflat",fRPV0C,fCentrality) ;
-  if(fHaveTPCRP){
-    FillHistogram("phiRPV0CTPC",fRP,fRPV0C,fCentrality) ;
-    FillHistogram("cos2V0CTPC",TMath::Cos(2.*(fRP-fRPV0C)),fCentrality) ;
-  }    
-  
-  FillHistogram("hSelEvents",4.5,fRunNumber-0.5) ;
-  FillHistogram("hTotSelEvents",4.5) ;
-  //All event selections done
-  FillHistogram("hCentrality",fCentrality,fRunNumber-0.5) ;
-  //Reaction plane is defined in the range (0;pi)
-  //We have 10 bins
-  Double_t averageRP = fRPV0A+fRPV0C+fRP ;
-  if(fHaveTPCRP)
-    averageRP/=3.;
-  else
-    averageRP/=2.;
-  Int_t irp=Int_t(10.*(averageRP)/TMath::Pi());
-  if(irp>9)irp=9 ;
-
-  if(!fPHOSEvents[zvtx][fCenBin][irp]) 
-    fPHOSEvents[zvtx][fCenBin][irp]=new TList() ;
-  TList * prevPHOS = fPHOSEvents[zvtx][fCenBin][irp] ;
 
-  //  ProcessMC() ;
+  //Remove 6 noisy channels in run 139036, LHC10h
+  if( 139036 == fRunNumber
+    && mod==1
+    && (ix==9||ix==10||ix==11)
+    && (iz==45 || iz==46))
+    return kFALSE;
 
-  if(fPHOSEvent)
-    fPHOSEvent->Clear() ;
-  else
-    fPHOSEvent = new TClonesArray("AliCaloPhoton",200) ;
+  return kTRUE ;
+}
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::FillPHOSCellQAHists()
+{
+  AliVCaloCells * cells = fEvent->GetPHOSCells();
 
-  //For re-calibration
-  const Double_t logWeight=4.5 ;  
+  FillHistogram("hCenPHOSCells",fCentralityV0M,cells->GetNumberOfCells()) ;
+  FillHistogram("hCenTrack",fCentralityV0M,fEvent->GetNumberOfTracks()) ;
 
-  TVector3 vertex(vtx5);
-  
-  Int_t multClust = event->GetNumberOfCaloClusters();
-  Int_t inPHOS=0,inMod1=0, inMod2=0, inMod3=0 ;
-  Double_t avrgEm1=0,avrgEm2=0,avrgEm3=0; //average cluster energy
 
-  AliESDCaloCells * cells = event->GetPHOSCells() ;
-  FillHistogram("hCenPHOSCells",fCentrality,cells->GetNumberOfCells()) ;
-  FillHistogram("hCenTrack",fCentrality,event->GetNumberOfTracks()) ;
-  
-  //QA PHOS cells
   Int_t nCellModule[3] = {0,0,0};
   for (Int_t iCell=0; iCell<cells->GetNumberOfCells(); iCell++) {
     Int_t cellAbsId = cells->GetCellNumber(iCell);
-    Int_t relId[4] ;
+    Int_t relId[4] = {0,0,0,0};
     fPHOSGeo->AbsToRelNumbering(cellAbsId,relId);
     Int_t mod1  = relId[0];
     Int_t cellX = relId[2];
@@ -651,11 +675,26 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
   FillHistogram("hCellMultEventM2",nCellModule[1]);
   FillHistogram("hCellMultEventM3",nCellModule[2]);
 
-  TVector3 localPos ;
-  for (Int_t i=0; i<multClust; i++) {
-    AliESDCaloCluster *clu = event->GetCaloCluster(i);
-    if ( !clu->IsPHOS() || clu->E()<0.3) continue;
-    
+}
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SelectPhotonClusters()
+{
+  // clear (or create) array for holding events photons/clusters
+  if(fCaloPhotonsPHOS)
+    fCaloPhotonsPHOS->Clear();
+  else {
+    fCaloPhotonsPHOS = new TObjArray(200);
+    fCaloPhotonsPHOS->SetOwner();
+  }
+
+  
+  AliESDCaloCells* esdCells = dynamic_cast<AliESDCaloCells*> (fEvent->GetPHOSCells());
+  for (Int_t i=0; i<fEvent->GetNumberOfCaloClusters(); i++) {
+    AliVCluster *clu = fEvent->GetCaloCluster(i);
+
+    if ( !clu->IsPHOS() || clu->E()< kMinClusterEnergy) continue; // reject cluster
+
+    // check if cell/channel is good.
     Float_t  position[3];
     clu->GetPosition(position);
     TVector3 global(position) ;
@@ -664,75 +703,75 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
     Int_t mod  = relId[0] ;
     Int_t cellX = relId[2];
     Int_t cellZ = relId[3] ;
-    if ( !IsGoodChannel("PHOS",mod,cellX,cellZ) ) 
-      continue ;
-    
-    //Remove 6 noisy channels in run 139036
-    if(event->GetRunNumber()==139036 && mod==1 && 
-       (cellX==9||cellX==10||cellX==11) && (cellZ==45 || cellZ==46))
-      continue ;
-    
-    FillHistogram("hCluEvsClu",clu->E(),clu->GetNCells()) ;
-
-    //Apply re-Calibreation
-    AliPHOSEsdCluster cluPHOS1(*clu);
-    cluPHOS1.Recalibrate(fPHOSCalibData,cells); // modify the cell energies
-    Reclusterize(&cluPHOS1) ;
-    cluPHOS1.EvalAll(logWeight,vertex);         // recalculate the cluster parameters
-    cluPHOS1.SetE(fNonLinCorr->Eval(cluPHOS1.E()));// Users's nonlinearity
-    if(cluPHOS1.E()<0.3) continue;
-    if(clu->GetNCells()<3) continue ;
-    if(clu->GetM02()<0.2)   continue ;
-        
-    //correct misalignment
-    const Float_t shiftX[6]={0.,-2.3,-2.11,-1.53,0.,0.} ;
-    const Float_t shiftZ[6]={0.,-0.4, 0.52, 0.8,0.,0.} ;
-    fPHOSGeo->Global2Local(localPos,global,mod) ;
-    fPHOSGeo->Local2Global(mod,localPos.X()+shiftX[mod],localPos.Z()+shiftZ[mod],global);  
-    position[0]=global.X() ;
-    position[1]=global.Y() ;
-    position[2]=global.Z() ;
-    cluPHOS1.SetPosition(position) ; 
-   
-    if(mod==1){
-      avrgEm1+=cluPHOS1.E() ;
-      inMod1++ ;
+    if ( !IsGoodChannel("PHOS",mod,cellX,cellZ) )
+      continue ; // reject if not.
+
+
+    FillHistogram("hCluEvsClu", clu->E(), clu->GetNCells()) ;
+
+    if(clu->GetNCells() < kMinNCells) continue ;
+    if(clu->GetM02() < kMinM02)   continue ;
+
+    TLorentzVector lorentzMomentum;
+    Double_t ecore;
+
+    //if ESD, Apply re-Calibreation
+    Double_t origo[3] = {0,0,0}; // don't rely on event vertex, assume (0,0,0)
+    if( fEventESD ) {
+      AliPHOSEsdCluster cluPHOS1( *(AliESDCaloCluster*) (clu) );
+      cluPHOS1.Recalibrate(fPHOSCalibData, esdCells); // modify the cell energies
+      Reclusterize(&cluPHOS1) ;
+      cluPHOS1.EvalAll(kLogWeight, fVertexVector);         // recalculate the cluster parameters
+      cluPHOS1.SetE(fNonLinCorr->Eval(cluPHOS1.E()));// Users's nonlinearity
+
+      if(cluPHOS1.E()<0.3) continue; // check energy again
+
+      //correct misalignment
+      TVector3 localPos;
+      const Float_t shiftX[6]={0.,-2.3,-2.11,-1.53,0.,0.} ;
+      const Float_t shiftZ[6]={0.,-0.4, 0.52, 0.8,0.,0.} ;
+      fPHOSGeo->Global2Local(localPos,global,mod) ;
+      fPHOSGeo->Local2Global(mod,localPos.X()+shiftX[mod],localPos.Z()+shiftZ[mod],global);
+      position[0]=global.X() ;
+      position[1]=global.Y() ;
+      position[2]=global.Z() ;
+      cluPHOS1.SetPosition(position);
+
+      cluPHOS1.GetMomentum(lorentzMomentum ,origo);
+      ecore = CoreEnergy(&cluPHOS1);
+      
+      //TODO: Check, this may be LHC10h specific:
+      if(mod==2) lorentzMomentum*=135.5/134.0 ;
+      if(mod==3) lorentzMomentum*=135.5/137.2 ;
+      if(mod==2) ecore*=135.5/134.0 ;
+      if(mod==3) ecore*=135.5/137.2 ;
+       
     }
-    if(mod==2){
-      avrgEm2+=cluPHOS1.E() ;
-      inMod2++ ;
+    else if (fEventAOD) { // is ! ESD, AOD.
+      AliESDCaloCluster* aodCluster = (AliESDCaloCluster*) (clu);
+      aodCluster->GetMomentum(lorentzMomentum ,origo);
+      ecore = CoreEnergy(clu);
     }
-    if(mod==3){
-      avrgEm3+=cluPHOS1.E() ;
-      inMod3++ ;
+    else {
+      AliError("(Calo)Cluster is neither ESD nor AOD");
+      continue;
     }
-       
-    TLorentzVector pv1 ;
-    cluPHOS1.GetMomentum(pv1 ,vtx0);
 
-    if(mod==2) pv1*=135.5/134.0 ;
-    if(mod==3) pv1*=135.5/137.2 ;
-    
-    Double_t ecore=CoreEnergy(&cluPHOS1) ; 
-    if(mod==2) ecore*=135.5/134.0 ;
-    if(mod==3) ecore*=135.5/137.2 ;
-    
+
+    char skey[55];
     snprintf(skey,55,"hCluLowM%d",mod) ;
     FillHistogram(skey,cellX,cellZ,1.);
-    if(cluPHOS1.E()>1.5){
+    if(lorentzMomentum.E()>1.5){
       sprintf(skey,"hCluHighM%d",mod) ;
       FillHistogram(skey,cellX,cellZ,1.);
     }
-    
-    if(inPHOS>=fPHOSEvent->GetSize()){
-      fPHOSEvent->Expand(inPHOS+50) ;
-    }
-    new((*fPHOSEvent)[inPHOS]) AliCaloPhoton(pv1.X(),pv1.Py(),pv1.Z(),pv1.E()) ;
-    AliCaloPhoton * ph = (AliCaloPhoton*)fPHOSEvent->At(inPHOS) ;
+
+    fCaloPhotonsPHOS->Add(new  AliCaloPhoton(lorentzMomentum.X(),lorentzMomentum.Py(),lorentzMomentum.Z(),lorentzMomentum.E()) );
+    AliCaloPhoton * ph = (AliCaloPhoton*) fCaloPhotonsPHOS->At( fCaloPhotonsPHOS->GetLast() );
+
     ph->SetModule(mod) ;
-    pv1*= ecore/pv1.E() ;
-    ph->SetMomV2(&pv1) ;
+    lorentzMomentum*= ecore/lorentzMomentum.E() ;
+    ph->SetMomV2(&lorentzMomentum) ;
     ph->SetNCells(clu->GetNCells());
     ph->SetDispBit(TestLambda(clu->E(),clu->GetM20(),clu->GetM02())) ;
     ph->SetDisp2Bit(TestLambda2(clu->E(),clu->GetM20(),clu->GetM02())) ;
@@ -740,21 +779,38 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
       sprintf(skey,"hCluDispM%d",mod) ;
       FillHistogram(skey,cellX,cellZ,1.);
     }
-    //Track matching
+
+    // Track Matching
     Double_t dx=clu->GetTrackDx() ;
     Double_t dz=clu->GetTrackDz() ;
     Bool_t cpvBit=kTRUE ; //No track matched by default
     Bool_t cpvBit2=kTRUE ; //More Strict criterion
-    TArrayI * itracks = clu->GetTracksMatched() ;  
-    if(itracks->GetSize()>0){
-      Int_t iTr = itracks->At(0);
-      if(iTr>=0 && iTr<event->GetNumberOfTracks()){
-        AliESDtrack *track = event->GetTrack(iTr) ;
-        Double_t pt = track->Pt() ;
-        Short_t charge = track->Charge() ;
-        Double_t r=TestCPV(dx, dz, pt,charge) ;
-       cpvBit=(r>2.) ;
-       cpvBit2=(r>4.) ;
+    if( fEventESD ) {
+      
+      TArrayI * itracks = static_cast<AliESDCaloCluster*> (clu)->GetTracksMatched() ;
+      if(itracks->GetSize()>0){
+       Int_t iTr = itracks->At(0);
+       if(iTr>=0 && iTr<fEvent->GetNumberOfTracks()){
+         AliVParticle* track = fEvent->GetTrack(iTr);
+         Double_t pt = track->Pt() ;
+         Short_t charge = track->Charge() ;
+         Double_t r=TestCPV(dx, dz, pt, charge) ;
+         cpvBit=(r>2.) ;
+         cpvBit2=(r>4.) ;
+       }
+      }
+    }
+    else if ( fEventAOD ) {
+      int nTracksMatched = clu->GetNTracksMatched();
+      if(nTracksMatched > 0) {
+       AliVTrack* track = dynamic_cast<AliVTrack*> (clu->GetTrackMatched(0));
+       if ( track ) {
+         Double_t pt = track->Pt();
+         Short_t charge = track->Charge();
+         Double_t r = TestCPV(dx, dz, pt, charge) ;
+         cpvBit=(r>2.) ;
+         cpvBit2=(r>4.) ;
+       }
       }
     }
     ph->SetCPVBit(cpvBit) ;
@@ -765,18 +821,18 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
     }
     ph->SetEMCx(float(cellX)) ;
     ph->SetEMCz(float(cellZ)) ;
-//    ph->SetLambdas(clu->GetM20(),clu->GetM02()) ;
-    ph->SetUnfolded(clu->GetNExMax()<2); // Remember, if it is unfolded          
-    inPHOS++ ;
+    //    ph->SetLambdas(clu->GetM20(),clu->GetM02()) ;
+    ph->SetUnfolded(clu->GetNExMax()<2); // Remember, if it is unfolde
+
   }
-  
-  FillHistogram("hCenPHOS",fCentrality,inPHOS) ;
+  FillHistogram("hCenPHOS",fCentralityV0M, fCaloPhotonsPHOS->GetEntries()) ;
+}
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::FillSelectedClusterHistograms()
+{
+  for (Int_t i1=0; i1<fCaloPhotonsPHOS->GetEntries(); i1++) {
+    AliCaloPhoton * ph1=(AliCaloPhoton*)fCaloPhotonsPHOS->At(i1) ;
 
-  
-  char key[55] ;
-  for (Int_t i1=0; i1<inPHOS; i1++) {
-    AliCaloPhoton * ph1=(AliCaloPhoton*)fPHOSEvent->At(i1) ;
-    
     Double_t dphiA=ph1->Phi()-fRPV0A ;
     while(dphiA<0)dphiA+=TMath::Pi() ;
     while(dphiA>TMath::Pi())dphiA-=TMath::Pi() ;
@@ -788,83 +844,85 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
     Double_t dphiT=ph1->Phi()-fRP ;
     while(dphiT<0)dphiT+=TMath::Pi() ;
     while(dphiT>TMath::Pi())dphiT-=TMath::Pi() ;
-    
-    FillHistogram(Form("hPhotPhiV0AAll_cen%d",fCenBin),ph1->Pt(),dphiA) ;
-    FillHistogram(Form("hPhotPhiV0CAll_cen%d",fCenBin),ph1->Pt(),dphiC) ;
+
+    FillHistogram(Form("hPhotPhiV0AAll_cen%d",fCentBin),ph1->Pt(),dphiA) ;
+    FillHistogram(Form("hPhotPhiV0CAll_cen%d",fCentBin),ph1->Pt(),dphiC) ;
     if(fHaveTPCRP)
-      FillHistogram(Form("hPhotPhiTPCAll_cen%d",fCenBin),ph1->Pt(),dphiT) ;
-    
-    FillHistogram(Form("hPhotAll_cen%d",fCenBin),ph1->Pt()) ;
-    FillHistogram(Form("hPhotAllcore_cen%d",fCenBin),ph1->GetMomV2()->Pt()) ;
+      FillHistogram(Form("hPhotPhiTPCAll_cen%d",fCentBin),ph1->Pt(),dphiT) ;
+
+    FillHistogram(Form("hPhotAll_cen%d",fCentBin),ph1->Pt()) ;
+    FillHistogram(Form("hPhotAllcore_cen%d",fCentBin),ph1->GetMomV2()->Pt()) ;
     if(ph1->IsntUnfolded()){
-      FillHistogram(Form("hPhotAllwou_cen%d",fCenBin),ph1->Pt()) ;
+      FillHistogram(Form("hPhotAllwou_cen%d",fCentBin),ph1->Pt()) ;
     }
     if(ph1->IsCPVOK()){
-      FillHistogram(Form("hPhotPhiV0ACPV_cen%d",fCenBin),ph1->Pt(),dphiA) ;
-      FillHistogram(Form("hPhotPhiV0CCPV_cen%d",fCenBin),ph1->Pt(),dphiC) ;
+      FillHistogram(Form("hPhotPhiV0ACPV_cen%d",fCentBin),ph1->Pt(),dphiA) ;
+      FillHistogram(Form("hPhotPhiV0CCPV_cen%d",fCentBin),ph1->Pt(),dphiC) ;
       if(fHaveTPCRP)
-        FillHistogram(Form("hPhotPhiTPCCPV_cen%d",fCenBin),ph1->Pt(),dphiT) ;
+        FillHistogram(Form("hPhotPhiTPCCPV_cen%d",fCentBin),ph1->Pt(),dphiT) ;
 
-      FillHistogram(Form("hPhotPhiV0ACPVcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiA) ;
-      FillHistogram(Form("hPhotPhiV0CCPVcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiC) ;
+      FillHistogram(Form("hPhotPhiV0ACPVcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiA) ;
+      FillHistogram(Form("hPhotPhiV0CCPVcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiC) ;
       if(fHaveTPCRP)
-        FillHistogram(Form("hPhotPhiTPCCPVcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiT) ;
+        FillHistogram(Form("hPhotPhiTPCCPVcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiT) ;
 
-      FillHistogram(Form("hPhotCPV_cen%d",fCenBin),ph1->Pt()) ;
-      FillHistogram(Form("hPhotCPVcore_cen%d",fCenBin),ph1->GetMomV2()->Pt()) ;
+      FillHistogram(Form("hPhotCPV_cen%d",fCentBin),ph1->Pt()) ;
+      FillHistogram(Form("hPhotCPVcore_cen%d",fCentBin),ph1->GetMomV2()->Pt()) ;
     }
     if(ph1->IsCPV2OK()){
-      FillHistogram(Form("hPhotCPV2_cen%d",fCenBin),ph1->Pt()) ;
+      FillHistogram(Form("hPhotCPV2_cen%d",fCentBin),ph1->Pt()) ;
     }
     if(ph1->IsDispOK()){
-      FillHistogram(Form("hPhotPhiV0ADisp_cen%d",fCenBin),ph1->Pt(),dphiA) ;
-      FillHistogram(Form("hPhotPhiV0CDisp_cen%d",fCenBin),ph1->Pt(),dphiC) ;
+      FillHistogram(Form("hPhotPhiV0ADisp_cen%d",fCentBin),ph1->Pt(),dphiA) ;
+      FillHistogram(Form("hPhotPhiV0CDisp_cen%d",fCentBin),ph1->Pt(),dphiC) ;
       if(fHaveTPCRP)
-        FillHistogram(Form("hPhotPhiTPCDisp_cen%d",fCenBin),ph1->Pt(),dphiT) ;
+        FillHistogram(Form("hPhotPhiTPCDisp_cen%d",fCentBin),ph1->Pt(),dphiT) ;
 
-      FillHistogram(Form("hPhotPhiV0ADispcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiA) ;
-      FillHistogram(Form("hPhotPhiV0CDispcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiC) ;
+      FillHistogram(Form("hPhotPhiV0ADispcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiA) ;
+      FillHistogram(Form("hPhotPhiV0CDispcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiC) ;
       if(fHaveTPCRP)
-        FillHistogram(Form("hPhotPhiTPCDispcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiT) ;
-      
-      FillHistogram(Form("hPhotDisp_cen%d",fCenBin),ph1->Pt()) ;
+        FillHistogram(Form("hPhotPhiTPCDispcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiT) ;
+
+      FillHistogram(Form("hPhotDisp_cen%d",fCentBin),ph1->Pt()) ;
       if(ph1->IsDisp2OK()){
-        FillHistogram(Form("hPhotDisp2_cen%d",fCenBin),ph1->Pt()) ;
+        FillHistogram(Form("hPhotDisp2_cen%d",fCentBin),ph1->Pt()) ;
       }
-      FillHistogram(Form("hPhotDispcore_cen%d",fCenBin),ph1->GetMomV2()->Pt()) ;
+      FillHistogram(Form("hPhotDispcore_cen%d",fCentBin),ph1->GetMomV2()->Pt()) ;
       if(ph1->IsntUnfolded()){
-        FillHistogram(Form("hPhotDispwou_cen%d",fCenBin),ph1->Pt()) ;
+        FillHistogram(Form("hPhotDispwou_cen%d",fCentBin),ph1->Pt()) ;
       }
       if(ph1->IsCPVOK()){
-       FillHistogram(Form("hPhotPhiV0ABoth_cen%d",fCenBin),ph1->Pt(),dphiA) ;
-       FillHistogram(Form("hPhotPhiV0CBoth_cen%d",fCenBin),ph1->Pt(),dphiC) ;
+       FillHistogram(Form("hPhotPhiV0ABoth_cen%d",fCentBin),ph1->Pt(),dphiA) ;
+       FillHistogram(Form("hPhotPhiV0CBoth_cen%d",fCentBin),ph1->Pt(),dphiC) ;
         if(fHaveTPCRP)
-         FillHistogram(Form("hPhotPhiTPCBoth_cen%d",fCenBin),ph1->Pt(),dphiT) ;
+         FillHistogram(Form("hPhotPhiTPCBoth_cen%d",fCentBin),ph1->Pt(),dphiT) ;
 
-       FillHistogram(Form("hPhotPhiV0ABothcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiA) ;
-       FillHistogram(Form("hPhotPhiV0CBothcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiC) ;
+       FillHistogram(Form("hPhotPhiV0ABothcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiA) ;
+       FillHistogram(Form("hPhotPhiV0CBothcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiC) ;
         if(fHaveTPCRP)
-         FillHistogram(Form("hPhotPhiTPCBothcore_cen%d",fCenBin),ph1->GetMomV2()->Pt(),dphiT) ;
+         FillHistogram(Form("hPhotPhiTPCBothcore_cen%d",fCentBin),ph1->GetMomV2()->Pt(),dphiT) ;
 
-       FillHistogram(Form("hPhotBoth_cen%d",fCenBin),ph1->Pt()) ;
-       FillHistogram(Form("hPhotBothcore_cen%d",fCenBin),ph1->GetMomV2()->Pt()) ;
+       FillHistogram(Form("hPhotBoth_cen%d",fCentBin),ph1->Pt()) ;
+       FillHistogram(Form("hPhotBothcore_cen%d",fCentBin),ph1->GetMomV2()->Pt()) ;
       }
-    }  
+    }
   }
-  
-  const Double_t alphaCut=0.7 ;
-  //pi0
-  for (Int_t i1=0; i1<inPHOS-1; i1++) {
-    AliCaloPhoton * ph1=(AliCaloPhoton*)fPHOSEvent->At(i1) ;
-    for (Int_t i2=i1+1; i2<inPHOS; i2++) {
-      AliCaloPhoton * ph2=(AliCaloPhoton*)fPHOSEvent->At(i2) ;
+}
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::ConsiderPi0s()
+{
+  char key[55];
+  for (Int_t i1=0; i1 < fCaloPhotonsPHOS->GetEntries()-1; i1++) {
+    AliCaloPhoton * ph1=(AliCaloPhoton*)fCaloPhotonsPHOS->At(i1) ;
+    for (Int_t i2=i1+1; i2<fCaloPhotonsPHOS->GetEntries(); i2++) {
+      AliCaloPhoton * ph2=(AliCaloPhoton*)fCaloPhotonsPHOS->At(i2) ;
       TLorentzVector p12  = *ph1  + *ph2;
-      TLorentzVector pv12 = *(ph1->GetMomV2()) + *(ph2->GetMomV2());      
-      FillHistogram("hPHOSphi",fCentrality,p12.Pt(),p12.Phi());
+      TLorentzVector pv12 = *(ph1->GetMomV2()) + *(ph2->GetMomV2());
+      FillHistogram("hPHOSphi",fCentralityV0M,p12.Pt(),p12.Phi());
       Double_t dphiA=p12.Phi()-fRPV0A ;
       while(dphiA<0)dphiA+=TMath::Pi() ;
       while(dphiA>TMath::Pi())dphiA-=TMath::Pi() ;
-      
+
       Double_t dphiC=p12.Phi()-fRPV0C ;
       while(dphiC<0)dphiC+=TMath::Pi() ;
       while(dphiC>TMath::Pi())dphiC-=TMath::Pi() ;
@@ -872,151 +930,151 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
       Double_t dphiT=p12.Phi()-fRP ;
       while(dphiT<0)dphiT+=TMath::Pi() ;
       while(dphiT>TMath::Pi())dphiT-=TMath::Pi() ;
-      
+
       Double_t a=TMath::Abs((ph1->E()-ph2->E())/(ph1->E()+ph2->E())) ;
-      
-      FillHistogram(Form("hMassPtV0AAll_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiA) ;
-      FillHistogram(Form("hMassPtV0CAll_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiC) ;
+
+      FillHistogram(Form("hMassPtV0AAll_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiA) ;
+      FillHistogram(Form("hMassPtV0CAll_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiC) ;
       if(fHaveTPCRP)
-        FillHistogram(Form("hMassPtTPCAll_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiT) ;
+        FillHistogram(Form("hMassPtTPCAll_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiT) ;
 
-      FillHistogram(Form("hMassPtV0AAllcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiA) ;
-      FillHistogram(Form("hMassPtV0CAllcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiC) ;
+      FillHistogram(Form("hMassPtV0AAllcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiA) ;
+      FillHistogram(Form("hMassPtV0CAllcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiC) ;
       if(fHaveTPCRP)
-        FillHistogram(Form("hMassPtTPCAllcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiT) ;
-      
-      
-      FillHistogram(Form("hPi0All_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-      FillHistogram(Form("hPi0Allcore_cen%d",fCenBin),pv12.M() ,pv12.Pt()) ;
+        FillHistogram(Form("hMassPtTPCAllcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiT) ;
+
+
+      FillHistogram(Form("hPi0All_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+      FillHistogram(Form("hPi0Allcore_cen%d",fCentBin),pv12.M() ,pv12.Pt()) ;
       if(ph1->IsntUnfolded() && ph2->IsntUnfolded()){
-        FillHistogram(Form("hPi0Allwou_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+        FillHistogram(Form("hPi0Allwou_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
       }
-      
-      FillHistogram(Form("hSingleAll_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
-      FillHistogram(Form("hSingleAll_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
-      FillHistogram(Form("hSingleAllcore_cen%d",fCenBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
-      FillHistogram(Form("hSingleAllcore_cen%d",fCenBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
+
+      FillHistogram(Form("hSingleAll_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
+      FillHistogram(Form("hSingleAll_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
+      FillHistogram(Form("hSingleAllcore_cen%d",fCentBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
+      FillHistogram(Form("hSingleAllcore_cen%d",fCentBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
       if(ph1->IsntUnfolded())
-        FillHistogram(Form("hSingleAllwou_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+        FillHistogram(Form("hSingleAllwou_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
       if(ph2->IsntUnfolded())
-        FillHistogram(Form("hSingleAllwou_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+        FillHistogram(Form("hSingleAllwou_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
       if(ph1->IsCPVOK()){
-        FillHistogram(Form("hSingleCPV_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
-        FillHistogram(Form("hSingleCPVcore_cen%d",fCenBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
+        FillHistogram(Form("hSingleCPV_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
+        FillHistogram(Form("hSingleCPVcore_cen%d",fCentBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
       }
       if(ph2->IsCPVOK()){
-        FillHistogram(Form("hSingleCPV_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
-        FillHistogram(Form("hSingleCPV_cen%d",fCenBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
+        FillHistogram(Form("hSingleCPV_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
+        FillHistogram(Form("hSingleCPV_cen%d",fCentBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
       }
       if(ph1->IsCPV2OK()){
-        FillHistogram(Form("hSingleCPV2_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+        FillHistogram(Form("hSingleCPV2_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
       }
       if(ph2->IsCPV2OK()){
-        FillHistogram(Form("hSingleCPV2_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
-      }      
+        FillHistogram(Form("hSingleCPV2_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
+      }
       if(ph1->IsDispOK()){
-        FillHistogram(Form("hSingleDisp_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+        FillHistogram(Form("hSingleDisp_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
         if(ph1->IsntUnfolded()){
-          FillHistogram(Form("hSingleDispwou_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+          FillHistogram(Form("hSingleDispwou_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
        }
-        FillHistogram(Form("hSingleDispcore_cen%d",fCenBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
+        FillHistogram(Form("hSingleDispcore_cen%d",fCentBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
       }
       if(ph2->IsDispOK()){
-        FillHistogram(Form("hSingleDisp_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+        FillHistogram(Form("hSingleDisp_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
         if(ph1->IsntUnfolded()){
-          FillHistogram(Form("hSingleDispwou_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+          FillHistogram(Form("hSingleDispwou_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
        }
-        FillHistogram(Form("hSingleDispcore_cen%d",fCenBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
+        FillHistogram(Form("hSingleDispcore_cen%d",fCentBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
       }
       if(ph1->IsDisp2OK()){
-        FillHistogram(Form("hSingleDisp2_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+        FillHistogram(Form("hSingleDisp2_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
       }
       if(ph2->IsDisp2OK()){
-        FillHistogram(Form("hSingleDisp2_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+        FillHistogram(Form("hSingleDisp2_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
       }
       if(ph1->IsDispOK() && ph1->IsCPVOK()){
-        FillHistogram(Form("hSingleBoth_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
-        FillHistogram(Form("hSingleBothcore_cen%d",fCenBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
+        FillHistogram(Form("hSingleBoth_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
+        FillHistogram(Form("hSingleBothcore_cen%d",fCentBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
       }
       if(ph2->IsDispOK() && ph2->IsCPVOK()){
-        FillHistogram(Form("hSingleBoth_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
-        FillHistogram(Form("hSingleBothcore_cen%d",fCenBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
-      }            
-      
-      
-      if(a<alphaCut){
-        FillHistogram(Form("hPi0All_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+        FillHistogram(Form("hSingleBoth_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
+        FillHistogram(Form("hSingleBothcore_cen%d",fCentBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
+      }
+
+
+      if(a<kAlphaCut){
+        FillHistogram(Form("hPi0All_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
       }
 
       if(ph1->IsCPVOK() && ph2->IsCPVOK()){
-       snprintf(key,55,"hMassPtCPV_cen%d",fCenBin) ;
-       FillHistogram(Form("hMassPtV0ACPV_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiA) ;
-       FillHistogram(Form("hMassPtV0CCPV_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiC) ;
+       snprintf(key,55,"hMassPtCPV_cen%d",fCentBin) ;
+       FillHistogram(Form("hMassPtV0ACPV_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiA) ;
+       FillHistogram(Form("hMassPtV0CCPV_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiC) ;
        if(fHaveTPCRP)
-         FillHistogram(Form("hMassPtTPCCPV_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiT) ;
+         FillHistogram(Form("hMassPtTPCCPV_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiT) ;
 
-       FillHistogram(Form("hMassPtV0ACPVcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiA) ;
-       FillHistogram(Form("hMassPtV0CCPVcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiC) ;
+       FillHistogram(Form("hMassPtV0ACPVcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiA) ;
+       FillHistogram(Form("hMassPtV0CCPVcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiC) ;
        if(fHaveTPCRP)
-         FillHistogram(Form("hMassPtTPCCPVcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiT) ;
+         FillHistogram(Form("hMassPtTPCCPVcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiT) ;
 
-       FillHistogram(Form("hPi0CPV_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-       FillHistogram(Form("hPi0CPVcore_cen%d",fCenBin),pv12.M(), pv12.Pt()) ;
-               
-        if(a<alphaCut){
-          FillHistogram(Form("hPi0CPV_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+       FillHistogram(Form("hPi0CPV_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+       FillHistogram(Form("hPi0CPVcore_cen%d",fCentBin),pv12.M(), pv12.Pt()) ;
+
+        if(a<kAlphaCut){
+          FillHistogram(Form("hPi0CPV_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
         }
-      } 
+      }
       if(ph1->IsCPV2OK() && ph2->IsCPV2OK()){
-       FillHistogram(Form("hPi0CPV2_cen%d",fCenBin),p12.M(),p12.Pt()) ;
-        if(a<alphaCut){
-          FillHistogram(Form("hPi0CPV2_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+       FillHistogram(Form("hPi0CPV2_cen%d",fCentBin),p12.M(),p12.Pt()) ;
+        if(a<kAlphaCut){
+          FillHistogram(Form("hPi0CPV2_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
         }
-      } 
+      }
       if(ph1->IsDispOK() && ph2->IsDispOK()){
-       snprintf(key,55,"hMassPtDisp_cen%d",fCenBin) ;
-       FillHistogram(Form("hMassPtV0ADisp_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiA) ;
-       FillHistogram(Form("hMassPtV0CDisp_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiC) ;
+       snprintf(key,55,"hMassPtDisp_cen%d",fCentBin) ;
+       FillHistogram(Form("hMassPtV0ADisp_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiA) ;
+       FillHistogram(Form("hMassPtV0CDisp_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiC) ;
        if(fHaveTPCRP)
-         FillHistogram(Form("hMassPtTPCDisp_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiT) ;
+         FillHistogram(Form("hMassPtTPCDisp_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiT) ;
 
-       FillHistogram(Form("hMassPtV0ADispcore_cen%d",fCenBin),pv12.M(), pv12.Pt(),dphiA) ;
-       FillHistogram(Form("hMassPtV0CDispcore_cen%d",fCenBin),pv12.M(), pv12.Pt(),dphiC) ;
+       FillHistogram(Form("hMassPtV0ADispcore_cen%d",fCentBin),pv12.M(), pv12.Pt(),dphiA) ;
+       FillHistogram(Form("hMassPtV0CDispcore_cen%d",fCentBin),pv12.M(), pv12.Pt(),dphiC) ;
        if(fHaveTPCRP)
-         FillHistogram(Form("hMassPtTPCDispcore_cen%d",fCenBin),pv12.M(), pv12.Pt(),dphiT) ;
-               
-       FillHistogram(Form("hPi0Disp_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-       FillHistogram(Form("hPi0Dispcore_cen%d",fCenBin),pv12.M(), pv12.Pt()) ;
+         FillHistogram(Form("hMassPtTPCDispcore_cen%d",fCentBin),pv12.M(), pv12.Pt(),dphiT) ;
+
+       FillHistogram(Form("hPi0Disp_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+       FillHistogram(Form("hPi0Dispcore_cen%d",fCentBin),pv12.M(), pv12.Pt()) ;
         if(ph1->IsDisp2OK() && ph2->IsDisp2OK()){
-         FillHistogram(Form("hPi0Disp2_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+         FillHistogram(Form("hPi0Disp2_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
        }
        if(ph1->IsntUnfolded() && ph2->IsntUnfolded()){
-         FillHistogram(Form("hPi0Dispwou_cen%d",fCenBin),p12.M(), p12.Pt()) ;
+         FillHistogram(Form("hPi0Dispwou_cen%d",fCentBin),p12.M(), p12.Pt()) ;
        }
-               
-        if(a<alphaCut){
-          FillHistogram(Form("hPi0Disp_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+
+        if(a<kAlphaCut){
+          FillHistogram(Form("hPi0Disp_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
         }
-       
+
        if(ph1->IsCPVOK() && ph2->IsCPVOK()){
-         FillHistogram(Form("hMassPtV0ABoth_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiA) ;
-         FillHistogram(Form("hMassPtV0CBoth_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiC) ;
+         FillHistogram(Form("hMassPtV0ABoth_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiA) ;
+         FillHistogram(Form("hMassPtV0CBoth_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiC) ;
           if(fHaveTPCRP)
-           FillHistogram(Form("hMassPtTPCBoth_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiT) ;
+           FillHistogram(Form("hMassPtTPCBoth_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiT) ;
 
-         FillHistogram(Form("hMassPtV0ABothcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiA) ;
-         FillHistogram(Form("hMassPtV0CBothcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiC) ;
+         FillHistogram(Form("hMassPtV0ABothcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiA) ;
+         FillHistogram(Form("hMassPtV0CBothcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiC) ;
           if(fHaveTPCRP)
-           FillHistogram(Form("hMassPtTPCBothcore_cen%d",fCenBin),pv12.M() ,pv12.Pt(),dphiT) ;
-                 
-         FillHistogram(Form("hPi0Both_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-         FillHistogram(Form("hPi0Bothcore_cen%d",fCenBin),pv12.M() ,pv12.Pt()) ;
-         
-          if(a<alphaCut){
-            snprintf(key,55,"hPi0Both_a07_cen%d",fCenBin) ;
-            FillHistogram(Form("hPi0Both_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+           FillHistogram(Form("hMassPtTPCBothcore_cen%d",fCentBin),pv12.M() ,pv12.Pt(),dphiT) ;
+
+         FillHistogram(Form("hPi0Both_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+         FillHistogram(Form("hPi0Bothcore_cen%d",fCentBin),pv12.M() ,pv12.Pt()) ;
+
+          if(a<kAlphaCut){
+            snprintf(key,55,"hPi0Both_a07_cen%d",fCentBin) ;
+            FillHistogram(Form("hPi0Both_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
           }
-         if(fCentrality>20.){
+         if(fCentralityV0M>20.){
           if(ph1->Module()==1 && ph2->Module()==1)
            FillHistogram("hPi0M11",p12.M(),p12.Pt() );
           else if(ph1->Module()==2 && ph2->Module()==2)
@@ -1035,12 +1093,18 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
       }
     } // end of loop i2
   } // end of loop i1
-  
-  //now mixed
-  for (Int_t i1=0; i1<inPHOS; i1++) {
-    AliCaloPhoton * ph1=(AliCaloPhoton*)fPHOSEvent->At(i1) ;
-    for(Int_t ev=0; ev<prevPHOS->GetSize();ev++){
-      TClonesArray * mixPHOS = static_cast<TClonesArray*>(prevPHOS->At(ev)) ;
+}
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::ConsiderPi0sMix()
+{
+  char key[55];
+
+  TList * arrayList = GetCaloPhotonsPHOSList(fVtxBin, fCentBin, fEMRPBin);
+
+  for (Int_t i1=0; i1<fCaloPhotonsPHOS->GetEntries(); i1++) {
+    AliCaloPhoton * ph1=(AliCaloPhoton*)fCaloPhotonsPHOS->At(i1) ;
+    for(Int_t evi=0; evi<arrayList->GetEntries();evi++){
+      TObjArray * mixPHOS = static_cast<TObjArray*>(arrayList->At(evi));
       for(Int_t i2=0; i2<mixPHOS->GetEntriesFast();i2++){
        AliCaloPhoton * ph2=(AliCaloPhoton*)mixPHOS->At(i2) ;
        TLorentzVector p12  = *ph1  + *ph2;
@@ -1057,205 +1121,174 @@ void AliAnalysisTaskPi0Flow::UserExec(Option_t *)
        Double_t dphiT=p12.Phi()-fRP ;
        while(dphiT<0)dphiT+=TMath::Pi() ;
        while(dphiT>TMath::Pi())dphiT-=TMath::Pi() ;
-       
-       
+
+
         Double_t a=TMath::Abs((ph1->E()-ph2->E())/(ph1->E()+ph2->E())) ;
-       
-       snprintf(key,55,"hMiMassPtAll_cen%d",fCenBin) ;
-       FillHistogram(Form("hMiMassPtV0AAll_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiA) ;
-       FillHistogram(Form("hMiMassPtV0CAll_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiC) ;
+
+       snprintf(key,55,"hMiMassPtAll_cen%d",fCentBin) ;
+       FillHistogram(Form("hMiMassPtV0AAll_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiA) ;
+       FillHistogram(Form("hMiMassPtV0CAll_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiC) ;
        if(fHaveTPCRP)
-         FillHistogram(Form("hMiMassPtTPCAll_cen%d",fCenBin),p12.M() ,p12.Pt(),dphiT) ;
+         FillHistogram(Form("hMiMassPtTPCAll_cen%d",fCentBin),p12.M() ,p12.Pt(),dphiT) ;
 
-       FillHistogram(Form("hMiMassPtV0AAllcore_cen%d",fCenBin),pv12.M(), pv12.Pt(), dphiA) ;
-       FillHistogram(Form("hMiMassPtV0CAllcore_cen%d",fCenBin),pv12.M(), pv12.Pt(), dphiC) ;
+       FillHistogram(Form("hMiMassPtV0AAllcore_cen%d",fCentBin),pv12.M(), pv12.Pt(), dphiA) ;
+       FillHistogram(Form("hMiMassPtV0CAllcore_cen%d",fCentBin),pv12.M(), pv12.Pt(), dphiC) ;
         if(fHaveTPCRP)
-         FillHistogram(Form("hMiMassPtTPCAllcore_cen%d",fCenBin),pv12.M(), pv12.Pt(), dphiT) ;
+         FillHistogram(Form("hMiMassPtTPCAllcore_cen%d",fCentBin),pv12.M(), pv12.Pt(), dphiT) ;
 
-       FillHistogram(Form("hMiPi0All_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-       FillHistogram(Form("hMiPi0Allcore_cen%d",fCenBin),pv12.M() ,pv12.Pt()) ;
+       FillHistogram(Form("hMiPi0All_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+       FillHistogram(Form("hMiPi0Allcore_cen%d",fCentBin),pv12.M() ,pv12.Pt()) ;
        if(ph1->IsntUnfolded() && ph2->IsntUnfolded()){
-         FillHistogram(Form("hMiPi0Allwou_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+         FillHistogram(Form("hMiPi0Allwou_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
        }
 
-        FillHistogram(Form("hMiSingleAll_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
-        FillHistogram(Form("hMiSingleAll_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
-        FillHistogram(Form("hMiSingleAllcore_cen%d",fCenBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
-        FillHistogram(Form("hMiSingleAllcore_cen%d",fCenBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
+        FillHistogram(Form("hMiSingleAll_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
+        FillHistogram(Form("hMiSingleAll_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
+        FillHistogram(Form("hMiSingleAllcore_cen%d",fCentBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
+        FillHistogram(Form("hMiSingleAllcore_cen%d",fCentBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
         if(ph1->IsntUnfolded())
-          FillHistogram(Form("hMiSingleAllwou_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+          FillHistogram(Form("hMiSingleAllwou_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
         if(ph2->IsntUnfolded())
-          FillHistogram(Form("hMiSingleAllwou_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+          FillHistogram(Form("hMiSingleAllwou_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
         if(ph1->IsCPVOK()){
-          FillHistogram(Form("hMiSingleCPV_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
-          FillHistogram(Form("hMiSingleCPVcore_cen%d",fCenBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
+          FillHistogram(Form("hMiSingleCPV_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
+          FillHistogram(Form("hMiSingleCPVcore_cen%d",fCentBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
         }
         if(ph2->IsCPVOK()){
-          FillHistogram(Form("hMiSingleCPV_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
-          FillHistogram(Form("hMiSingleCPVcore_cen%d",fCenBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
+          FillHistogram(Form("hMiSingleCPV_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
+          FillHistogram(Form("hMiSingleCPVcore_cen%d",fCentBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
         }
         if(ph1->IsCPV2OK()){
-          FillHistogram(Form("hMiSingleCPV2_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+          FillHistogram(Form("hMiSingleCPV2_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
         }
         if(ph2->IsCPV2OK()){
-          FillHistogram(Form("hMiSingleCPV2_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
-        }      
+          FillHistogram(Form("hMiSingleCPV2_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
+        }
         if(ph1->IsDispOK()){
-          FillHistogram(Form("hMiSingleDisp_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+          FillHistogram(Form("hMiSingleDisp_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
           if(ph1->IsntUnfolded()){
-            FillHistogram(Form("hMiSingleDispwou_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
+            FillHistogram(Form("hMiSingleDispwou_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
          }
-          FillHistogram(Form("hMiSingleDispcore_cen%d",fCenBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
+          FillHistogram(Form("hMiSingleDispcore_cen%d",fCentBin),pv12.M(),ph1->GetMomV2()->Pt()) ;
         }
         if(ph2->IsDispOK()){
-          FillHistogram(Form("hMiSingleDisp_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+          FillHistogram(Form("hMiSingleDisp_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
           if(ph1->IsntUnfolded()){
-            FillHistogram(Form("hMiSingleDispwou_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+            FillHistogram(Form("hMiSingleDispwou_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
          }
-          FillHistogram(Form("hMiSingleDispcore_cen%d",fCenBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
+          FillHistogram(Form("hMiSingleDispcore_cen%d",fCentBin),pv12.M(),ph2->GetMomV2()->Pt()) ;
         }
         if(ph1->IsDisp2OK()){
-          FillHistogram(Form("hMiSingleDisp2_cen%d",fCenBin),p12.M(),ph1->Pt()) ;
-        } 
+          FillHistogram(Form("hMiSingleDisp2_cen%d",fCentBin),p12.M(),ph1->Pt()) ;
+        }
         if(ph2->IsDisp2OK()){
-          FillHistogram(Form("hMiSingleDisp2_cen%d",fCenBin),p12.M(),ph2->Pt()) ;
+          FillHistogram(Form("hMiSingleDisp2_cen%d",fCentBin),p12.M(),ph2->Pt()) ;
         }
         if(ph1->IsDispOK() && ph1->IsCPVOK()){
-          snprintf(key,55,"hMiSingleBoth_cen%d",fCenBin) ;
+          snprintf(key,55,"hMiSingleBoth_cen%d",fCentBin) ;
           FillHistogram(key,p12.M(),ph1->Pt()) ;
-          snprintf(key,55,"hMiSingleBothcore_cen%d",fCenBin) ;
+          snprintf(key,55,"hMiSingleBothcore_cen%d",fCentBin) ;
           FillHistogram(key,pv12.M(),ph1->GetMomV2()->Pt()) ;
         }
         if(ph2->IsDispOK() && ph2->IsCPVOK()){
-          snprintf(key,55,"hMiSingleBoth_cen%d",fCenBin) ;
+          snprintf(key,55,"hMiSingleBoth_cen%d",fCentBin) ;
           FillHistogram(key,p12.M(),ph2->Pt()) ;
-          snprintf(key,55,"hMiSingleBothcore_cen%d",fCenBin) ;
+          snprintf(key,55,"hMiSingleBothcore_cen%d",fCentBin) ;
           FillHistogram(key,pv12.M(),ph2->GetMomV2()->Pt()) ;
-        }            
-       
-       
-       
-        if(a<alphaCut){
-          snprintf(key,55,"hMiPi0All_a07_cen%d",fCenBin) ;
+        }
+
+
+
+        if(a<kAlphaCut){
+          snprintf(key,55,"hMiPi0All_a07_cen%d",fCentBin) ;
           FillHistogram(key,p12.M() ,p12.Pt()) ;
         }
        if(ph1->IsCPVOK() && ph2->IsCPVOK()){
-         FillHistogram(Form("hMiMassPtV0ACPV_cen%d",fCenBin),p12.M(), p12.Pt(),dphiA) ;
-         FillHistogram(Form("hMiMassPtV0CCPV_cen%d",fCenBin),p12.M(), p12.Pt(),dphiC) ;
+         FillHistogram(Form("hMiMassPtV0ACPV_cen%d",fCentBin),p12.M(), p12.Pt(),dphiA) ;
+         FillHistogram(Form("hMiMassPtV0CCPV_cen%d",fCentBin),p12.M(), p12.Pt(),dphiC) ;
          if(fHaveTPCRP)
-           FillHistogram(Form("hMiMassPtTPCCPV_cen%d",fCenBin),p12.M(), p12.Pt(),dphiT) ;
+           FillHistogram(Form("hMiMassPtTPCCPV_cen%d",fCentBin),p12.M(), p12.Pt(),dphiT) ;
 
-         FillHistogram(Form("hMiMassPtV0ACPVcore_cen%d",fCenBin),pv12.M(), pv12.Pt(),dphiA) ;
-         FillHistogram(Form("hMiMassPtV0CCPVcore_cen%d",fCenBin),pv12.M(), pv12.Pt(),dphiC) ;
+         FillHistogram(Form("hMiMassPtV0ACPVcore_cen%d",fCentBin),pv12.M(), pv12.Pt(),dphiA) ;
+         FillHistogram(Form("hMiMassPtV0CCPVcore_cen%d",fCentBin),pv12.M(), pv12.Pt(),dphiC) ;
          if(fHaveTPCRP)
-           FillHistogram(Form("hMiMassPtTPCCPVcore_cen%d",fCenBin),pv12.M(), pv12.Pt(),dphiT) ;
-         
-         FillHistogram(Form("hMiPi0CPV_cen%d",fCenBin),p12.M(), p12.Pt()) ;
-         FillHistogram(Form("hMiPi0CPVcore_cen%d",fCenBin),pv12.M(), pv12.Pt()) ;
+           FillHistogram(Form("hMiMassPtTPCCPVcore_cen%d",fCentBin),pv12.M(), pv12.Pt(),dphiT) ;
+
+         FillHistogram(Form("hMiPi0CPV_cen%d",fCentBin),p12.M(), p12.Pt()) ;
+         FillHistogram(Form("hMiPi0CPVcore_cen%d",fCentBin),pv12.M(), pv12.Pt()) ;
 
-         if(a<alphaCut){
-            FillHistogram(Form("hMiPi0CPV_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+         if(a<kAlphaCut){
+            FillHistogram(Form("hMiPi0CPV_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
           }
        }
        if(ph1->IsCPV2OK() && ph2->IsCPV2OK()){
-         FillHistogram(Form("hMiPi0CPV2_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+         FillHistogram(Form("hMiPi0CPV2_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
 
-         if(a<alphaCut){
-            FillHistogram(Form("hMiPi0CPV2_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+         if(a<kAlphaCut){
+            FillHistogram(Form("hMiPi0CPV2_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
           }
        }
        if(ph1->IsDispOK() && ph2->IsDispOK()){
-         FillHistogram(Form("hMiMassPtV0ADisp_cen%d",fCenBin),p12.M(),p12.Pt(),dphiA) ;
-         FillHistogram(Form("hMiMassPtV0CDisp_cen%d",fCenBin),p12.M(),p12.Pt(),dphiC) ;
+         FillHistogram(Form("hMiMassPtV0ADisp_cen%d",fCentBin),p12.M(),p12.Pt(),dphiA) ;
+         FillHistogram(Form("hMiMassPtV0CDisp_cen%d",fCentBin),p12.M(),p12.Pt(),dphiC) ;
           if(fHaveTPCRP)
-           FillHistogram(Form("hMiMassPtTPCDisp_cen%d",fCenBin),p12.M(),p12.Pt(),dphiT) ;
-         
-         FillHistogram(Form("hMiMassPtV0ADispcore_cen%d",fCenBin),pv12.M(),pv12.Pt(),dphiA) ;
-         FillHistogram(Form("hMiMassPtV0CDispcore_cen%d",fCenBin),pv12.M(),pv12.Pt(),dphiC) ;
+           FillHistogram(Form("hMiMassPtTPCDisp_cen%d",fCentBin),p12.M(),p12.Pt(),dphiT) ;
+
+         FillHistogram(Form("hMiMassPtV0ADispcore_cen%d",fCentBin),pv12.M(),pv12.Pt(),dphiA) ;
+         FillHistogram(Form("hMiMassPtV0CDispcore_cen%d",fCentBin),pv12.M(),pv12.Pt(),dphiC) ;
           if(fHaveTPCRP)
-           FillHistogram(Form("hMiMassPtTPCDispcore_cen%d",fCenBin),pv12.M(),pv12.Pt(),dphiT) ;
+           FillHistogram(Form("hMiMassPtTPCDispcore_cen%d",fCentBin),pv12.M(),pv12.Pt(),dphiT) ;
+
 
-         
-         FillHistogram(Form("hMiPi0Disp_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-         FillHistogram(Form("hMiPi0Dispcore_cen%d",fCenBin),pv12.M(),pv12.Pt()) ;
+         FillHistogram(Form("hMiPi0Disp_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+         FillHistogram(Form("hMiPi0Dispcore_cen%d",fCentBin),pv12.M(),pv12.Pt()) ;
           if(ph1->IsntUnfolded() && ph2->IsntUnfolded()){
-           FillHistogram(Form("hMiPi0Dispwou_cen%d",fCenBin),p12.M(),p12.Pt()) ;
+           FillHistogram(Form("hMiPi0Dispwou_cen%d",fCentBin),p12.M(),p12.Pt()) ;
          }
-         
-         if(a<alphaCut){
-            FillHistogram(Form("hMiPi0Disp_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-          }      
+
+         if(a<kAlphaCut){
+            FillHistogram(Form("hMiPi0Disp_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+          }
          if(ph1->IsCPVOK() && ph2->IsCPVOK()){
-           FillHistogram(Form("hMiMassPtV0ABoth_cen%d",fCenBin),p12.M(),p12.Pt(),dphiA) ;
-           FillHistogram(Form("hMiMassPtV0CBoth_cen%d",fCenBin),p12.M(),p12.Pt(),dphiC) ;
+           FillHistogram(Form("hMiMassPtV0ABoth_cen%d",fCentBin),p12.M(),p12.Pt(),dphiA) ;
+           FillHistogram(Form("hMiMassPtV0CBoth_cen%d",fCentBin),p12.M(),p12.Pt(),dphiC) ;
            if(fHaveTPCRP)
-             FillHistogram(Form("hMiMassPtTPCBoth_cen%d",fCenBin),p12.M(),p12.Pt(),dphiT) ;
+             FillHistogram(Form("hMiMassPtTPCBoth_cen%d",fCentBin),p12.M(),p12.Pt(),dphiT) ;
 
-           FillHistogram(Form("hMiMassPtV0ABothcore_cen%d",fCenBin),pv12.M(),pv12.Pt(),dphiA) ;
-           FillHistogram(Form("hMiMassPtV0CBothcore_cen%d",fCenBin),pv12.M(),pv12.Pt(),dphiC) ;
+           FillHistogram(Form("hMiMassPtV0ABothcore_cen%d",fCentBin),pv12.M(),pv12.Pt(),dphiA) ;
+           FillHistogram(Form("hMiMassPtV0CBothcore_cen%d",fCentBin),pv12.M(),pv12.Pt(),dphiC) ;
            if(fHaveTPCRP)
-             FillHistogram(Form("hMiMassPtTPCBothcore_cen%d",fCenBin),pv12.M(),pv12.Pt(),dphiT) ;
-                           
-           FillHistogram(Form("hMiPi0Both_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
-           FillHistogram(Form("hMiPi0Bothcore_cen%d",fCenBin),pv12.M(),pv12.Pt()) ;
+             FillHistogram(Form("hMiMassPtTPCBothcore_cen%d",fCentBin),pv12.M(),pv12.Pt(),dphiT) ;
 
-           if(a<alphaCut){
-              FillHistogram(Form("hMiPi0Both_a07_cen%d",fCenBin),p12.M() ,p12.Pt()) ;
+           FillHistogram(Form("hMiPi0Both_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
+           FillHistogram(Form("hMiPi0Bothcore_cen%d",fCentBin),pv12.M(),pv12.Pt()) ;
+
+           if(a<kAlphaCut){
+              FillHistogram(Form("hMiPi0Both_a07_cen%d",fCentBin),p12.M() ,p12.Pt()) ;
             }
          }
        }
       } // end of loop i2
     }
   } // end of loop i1
-  
-  
-  //Now we either add current events to stack or remove
-  //If no photons in current event - no need to add it to mixed
-  if(fPHOSEvent->GetEntriesFast()>0){
-    prevPHOS->AddFirst(fPHOSEvent) ;
-    fPHOSEvent=0;
-    if(prevPHOS->GetSize()>100){//Remove redundant events
-      TClonesArray * tmp = static_cast<TClonesArray*>(prevPHOS->Last()) ;
-      prevPHOS->RemoveLast() ;
-      delete tmp ;
-    }
-  }
-  // Post output data.
-  PostData(1, fOutputContainer);
-  fEventCounter++;
-}
-
-//________________________________________________________________________
-void AliAnalysisTaskPi0Flow::Terminate(Option_t *)
-{
-  // Draw result to the screen
-  // Called once at the end of the query
-  
 }
-
-//________________________________________________________________________
-Bool_t AliAnalysisTaskPi0Flow::IsGoodChannel(const char * det, Int_t mod, Int_t ix, Int_t iz)
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::UpdateLists()
 {
-  //Check if this channel belogs to the good ones
-
-  if(strcmp(det,"PHOS")==0){
-    if(mod>5 || mod<1){
-      AliError(Form("No bad map for PHOS module %d ",mod)) ;
-      return kTRUE ;
-    }
-    if(!fPHOSBadMap[mod]){
-      AliError(Form("No Bad map for PHOS module %d",mod)) ;
-      return kTRUE ;
+  //Now we either add current events to stack or remove
+  //If no photons in current event - no need to add it to mixed
+  TList * arrayList = GetCaloPhotonsPHOSList(fVtxBin, fCentBin, fEMRPBin);
+  if(fCaloPhotonsPHOS->GetEntries()>0){
+    arrayList->AddFirst(fCaloPhotonsPHOS) ;
+    fCaloPhotonsPHOS=0;
+    if(arrayList->GetEntries()>100){//Remove redundant events
+      TObjArray * tmp = static_cast<TObjArray*>(arrayList->Last()) ;
+      arrayList->RemoveLast() ;
+      delete tmp ; // TODO: may conflict with delete done by list being owner.
     }
-    if(fPHOSBadMap[mod]->GetBinContent(ix,iz)>0)
-      return kFALSE ;
-    else
-      return kTRUE ;
   }
-  else{
-    AliError(Form("Can not find bad channels for detector %s ",det)) ;
-  }
-  return kTRUE ;
+  else
+    fCaloPhotonsPHOS->Clear(); // TODO: redundant???
 }
 //_____________________________________________________________________________
 void AliAnalysisTaskPi0Flow::FillHistogram(const char * key,Double_t x)const{
@@ -1314,190 +1347,480 @@ void AliAnalysisTaskPi0Flow::FillHistogram(const char * key,Double_t x,Double_t
   }
 }
 
+//_____________________________________________________________________________
+AliVEvent* AliAnalysisTaskPi0Flow::GetEvent()
+{
+  fEvent = InputEvent();
+  if( ! fEvent ) {
+    AliError("Event could not be retrieved");
+    PostData(1, fOutputContainer);
+  }
+  return fEvent;
+}
+
+
 //___________________________________________________________________________
-Int_t AliAnalysisTaskPi0Flow::ConvertRunNumber(Int_t run){
-
-  switch(run){ 
-  case  139517 : return 137; 
-  case  139514 : return 136; 
-  case  139513 : return 135; 
-  case  139511 : return 134; 
-  case  139510 : return 133; 
-  case  139507 : return 132; 
-  case  139505 : return 131; 
-  case  139504 : return 130; 
-  case  139503 : return 129; 
-  case  139470 : return 128; 
-  case  139467 : return 127; 
-  case  139466 : return 126; 
-  case  139465 : return 125; 
-  case  139440 : return 124; 
-  case  139439 : return 123; 
-  case  139438 : return 122; 
-  case  139437 : return 121; 
-  case  139360 : return 120; 
-  case  139329 : return 119; 
-  case  139328 : return 118; 
-  case  139314 : return 117; 
-  case  139311 : return 116; 
-  case  139310 : return 115; 
-  case  139309 : return 114; 
-  case  139308 : return 113; 
-  case  139173 : return 112; 
-  case  139172 : return 111; 
-  case  139110 : return 110; 
-  case  139107 : return 109; 
-  case  139105 : return 108; 
-  case  139104 : return 107; 
-  case  139042 : return 106; 
-  case  139038 : return 105; 
-  case  139037 : return 104; 
-  case  139036 : return 103; 
-  case  139029 : return 102; 
-  case  139028 : return 101; 
-  case  138983 : return 100; 
-  case  138982 : return 99; 
-  case  138980 : return 98; 
-  case  138979 : return 97; 
-  case  138978 : return 96; 
-  case  138977 : return 95; 
-  case  138976 : return 94; 
-  case  138973 : return 93; 
-  case  138972 : return 92; 
-  case  138965 : return 91; 
-  case  138924 : return 90; 
-  case  138872 : return 89; 
-  case  138871 : return 88; 
-  case  138870 : return 87; 
-  case  138837 : return 86; 
-  case  138830 : return 85; 
-  case  138828 : return 84; 
-  case  138826 : return 83; 
-  case  138796 : return 82; 
-  case  138795 : return 81; 
-  case  138742 : return 80; 
-  case  138732 : return 79; 
-  case  138730 : return 78; 
-  case  138666 : return 77; 
-  case  138662 : return 76; 
-  case  138653 : return 75; 
-  case  138652 : return 74; 
-  case  138638 : return 73; 
-  case  138624 : return 72; 
-  case  138621 : return 71; 
-  case  138583 : return 70; 
-  case  138582 : return 69; 
-  case  138579 : return 68; 
-  case  138578 : return 67; 
-  case  138534 : return 66; 
-  case  138469 : return 65; 
-  case  138442 : return 64; 
-  case  138439 : return 63; 
-  case  138438 : return 62; 
-  case  138396 : return 61; 
-  case  138364 : return 60; 
-  case  138359 : return 59; 
-  case  138275 : return 58; 
-  case  138225 : return 57; 
-  case  138201 : return 56; 
-  case  138200 : return 55; 
-  case  138197 : return 54; 
-  case  138192 : return 53; 
-  case  138190 : return 52; 
-  case  138154 : return 51; 
-  case  138153 : return 50; 
-  case  138151 : return 49; 
-  case  138150 : return 48; 
-  case  138126 : return 47; 
-  case  138125 : return 46; 
-  case  137848 : return 45; 
-  case  137847 : return 44; 
-  case  137844 : return 43; 
-  case  137843 : return 42; 
-  case  137752 : return 41; 
-  case  137751 : return 40; 
-  case  137748 : return 39; 
-  case  137724 : return 38; 
-  case  137722 : return 37; 
-  case  137718 : return 36; 
-  case  137704 : return 35; 
-  case  137693 : return 34; 
-  case  137692 : return 33; 
-  case  137691 : return 32; 
-  case  137689 : return 31; 
-  case  137686 : return 30; 
-  case  137685 : return 29; 
-  case  137639 : return 28; 
-  case  137638 : return 27; 
-  case  137608 : return 26; 
-  case  137595 : return 25; 
-  case  137549 : return 24; 
-  case  137546 : return 23; 
-  case  137544 : return 22; 
-  case  137541 : return 21; 
-  case  137539 : return 20; 
-  case  137531 : return 19; 
-  case  137530 : return 18; 
-  case  137443 : return 17; 
-  case  137441 : return 16; 
-  case  137440 : return 15; 
-  case  137439 : return 14; 
-  case  137434 : return 13; 
-  case  137432 : return 12; 
-  case  137431 : return 11; 
-  case  137430 : return 10; 
-  case  137366 : return 9; 
-  case  137243 : return 8; 
-  case  137236 : return 7; 
-  case  137235 : return 6; 
-  case  137232 : return 5; 
-  case  137231 : return 4; 
-  case  137165 : return 3; 
-  case  137162 : return 2; 
-  case  137161 : return 1;
-  default : return 199;
-  } 
+AliStack* AliAnalysisTaskPi0Flow::GetMCStack()
+{
+  fMCStack = 0;
+  AliVEventHandler* eventHandler = AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler();
+  if(eventHandler){
+    AliMCEventHandler* mcEventHandler = dynamic_cast<AliMCEventHandler*> (eventHandler);
+    if( mcEventHandler)
+      fMCStack = static_cast<AliMCEventHandler*>(AliAnalysisManager::GetAnalysisManager()->GetMCtruthEventHandler())->MCEvent()->Stack();
+  }
+  return fMCStack;
+}
 
+//___________________________________________________________________________
+Int_t AliAnalysisTaskPi0Flow::GetCentralityBin(Float_t centralityV0M)
+{
+ /* fCentBin=1+Int_t(centralityV0M/100. *kNCenBins) ;
+  if(centralityV0M < 5. || fCentBin < 0)
+   fCentBin=0 ;
+  if(fCentBin > kNCenBins-1)
+    fCentBin = kNCenBins-1 ;
+ */
+  int lastBinUpperIndex = fCentEdges.GetSize() -1;
+  if( centralityV0M > fCentEdges[lastBinUpperIndex] ) {
+    if(fDebug > 1)
+      AliInfo( Form("centrality (%f) larger then upper edge of last centrality bin (%f)!", centralityV0M, fCentEdges[lastBinUpperIndex]) );
+    return lastBinUpperIndex-1;
+  }
+  if( centralityV0M < fCentEdges[0] ) {
+    if( fDebug > 2 )
+      AliInfo( Form("centrality (%f) smaller then lower edge of first bin (%f)!", centralityV0M, fCentEdges[0]) );
+    return 0;
+  }
+  
+  fCentBin = TMath::BinarySearch<Double_t> ( GetNumberOfCentralityBins(), fCentEdges.GetArray(), centralityV0M );
+  return fCentBin;
+}
+
+//___________________________________________________________________________
+Int_t AliAnalysisTaskPi0Flow::GetRPBin()
+{
+  Double_t averageRP;
+  if(fHaveTPCRP)
+    averageRP = fRPV0A+fRPV0C+fRP /3.;
+  else
+    averageRP = fRPV0A+fRPV0C /2.;
+
+  fEMRPBin = Int_t(fNEMRPBins*(averageRP)/TMath::Pi());
+
+  if(fEMRPBin> (Int_t) fNEMRPBins-1)
+    fEMRPBin=fNEMRPBins-1 ;
+  else if(fEMRPBin<0)
+    fEMRPBin=0;
+
+  return fEMRPBin;
+}
+
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::LogProgress(int step, int internalRunNumber)
+{
+  if(fDebug > 1) {
+    AliInfo(Form("step %d completed", step));
+  }
+  // the +0.5 is not realy neccisarry, but oh well... -henrik
+  FillHistogram("hSelEvents", step+0.5, internalRunNumber-0.5);
+  FillHistogram("hTotSelEvents", step+0.5);
+}
+
+//___________________________________________________________________________
+Int_t AliAnalysisTaskPi0Flow::ConvertToInternalRunNumber(Int_t run){
+  if( kLHC11h == fPeriod ) {
+    switch(run){
+    case  170593 : return 179 ;
+    case  170572 : return 178 ;
+    case  170556 : return 177 ;
+    case  170552 : return 176 ;
+    case  170546 : return 175 ;
+    case  170390 : return 174 ;
+    case  170389 : return 173 ;
+    case  170388 : return 172 ;
+    case  170387 : return 171 ;
+    case  170315 : return 170 ;
+    case  170313 : return 169 ;
+    case  170312 : return 168 ;
+    case  170311 : return 167 ;
+    case  170309 : return 166 ;
+    case  170308 : return 165 ;
+    case  170306 : return 164 ;
+    case  170270 : return 163 ;
+    case  170269 : return 162 ;
+    case  170268 : return 161 ;
+    case  170267 : return 160 ;
+    case  170264 : return 159 ;
+    case  170230 : return 158 ;
+    case  170228 : return 157 ;
+    case  170208 : return 156 ;
+    case  170207 : return 155 ;
+    case  170205 : return 154 ;
+    case  170204 : return 153 ;
+    case  170203 : return 152 ;
+    case  170195 : return 151 ;
+    case  170193 : return 150 ;
+    case  170163 : return 149 ;
+    case  170162 : return 148 ;
+    case  170159 : return 147 ;
+    case  170155 : return 146 ;
+    case  170152 : return 145 ;
+    case  170091 : return 144 ;
+    case  170089 : return 143 ;
+    case  170088 : return 142 ;
+    case  170085 : return 141 ;
+    case  170084 : return 140 ;
+    case  170083 : return 139 ;
+    case  170081 : return 138 ;
+    case  170040 : return 137 ;
+    case  170038 : return 136 ;
+    case  170036 : return 135 ;
+    case  170027 : return 134 ;
+    case  169981 : return 133 ;
+    case  169975 : return 132 ;
+    case  169969 : return 131 ;
+    case  169965 : return 130 ;
+    case  169961 : return 129 ;
+    case  169956 : return 128 ;
+    case  169926 : return 127 ;
+    case  169924 : return 126 ;
+    case  169923 : return 125 ;
+    case  169922 : return 124 ;
+    case  169919 : return 123 ;
+    case  169918 : return 122 ;
+    case  169914 : return 121 ;
+    case  169859 : return 120 ;
+    case  169858 : return 119 ;
+    case  169855 : return 118 ;
+    case  169846 : return 117 ;
+    case  169838 : return 116 ;
+    case  169837 : return 115 ;
+    case  169835 : return 114 ;
+    case  169683 : return 113 ;
+    case  169628 : return 112 ;
+    case  169591 : return 111 ;
+    case  169590 : return 110 ;
+    case  169588 : return 109 ;
+    case  169587 : return 108 ;
+    case  169586 : return 107 ;
+    case  169584 : return 106 ;
+    case  169557 : return 105 ;
+    case  169555 : return 104 ;
+    case  169554 : return 103 ;
+    case  169553 : return 102 ;
+    case  169550 : return 101 ;
+    case  169515 : return 100 ;
+    case  169512 : return 99 ;
+    case  169506 : return 98 ;
+    case  169504 : return 97 ;
+    case  169498 : return 96 ;
+    case  169475 : return 95 ;
+    case  169420 : return 94 ;
+    case  169419 : return 93 ;
+    case  169418 : return 92 ;
+    case  169417 : return 91 ;
+    case  169415 : return 90 ;
+    case  169411 : return 89 ;
+    case  169238 : return 88 ;
+    case  169236 : return 87 ;
+    case  169167 : return 86 ;
+    case  169160 : return 85 ;
+    case  169156 : return 84 ;
+    case  169148 : return 83 ;
+    case  169145 : return 82 ;
+    case  169144 : return 81 ;
+    case  169143 : return 80 ;
+    case  169138 : return 79 ;
+    case  169099 : return 78 ;
+    case  169094 : return 77 ;
+    case  169091 : return 76 ;
+    case  169045 : return 75 ;
+    case  169044 : return 74 ;
+    case  169040 : return 73 ;
+    case  169035 : return 72 ;
+    case  168992 : return 71 ;
+    case  168988 : return 70 ;
+    case  168984 : return 69 ;
+    case  168826 : return 68 ;
+    case  168777 : return 67 ;
+    case  168514 : return 66 ;
+    case  168512 : return 65 ;
+    case  168511 : return 64 ;
+    case  168467 : return 63 ;
+    case  168464 : return 62 ;
+    case  168461 : return 61 ;
+    case  168460 : return 60 ;
+    case  168458 : return 59 ;
+    case  168362 : return 58 ;
+    case  168361 : return 57 ;
+    case  168356 : return 56 ;
+    case  168342 : return 55 ;
+    case  168341 : return 54 ;
+    case  168325 : return 53 ;
+    case  168322 : return 52 ;
+    case  168318 : return 51 ;
+    case  168311 : return 50 ;
+    case  168310 : return 49 ;
+    case  168213 : return 48 ;
+    case  168212 : return 47 ;
+    case  168208 : return 46 ;
+    case  168207 : return 45 ;
+    case  168206 : return 44 ;
+    case  168205 : return 43 ;
+    case  168204 : return 42 ;
+    case  168203 : return 41 ;
+    case  168181 : return 40 ;
+    case  168177 : return 39 ;
+    case  168175 : return 38 ;
+    case  168173 : return 37 ;
+    case  168172 : return 36 ;
+    case  168171 : return 35 ;
+    case  168115 : return 34 ;
+    case  168108 : return 33 ;
+    case  168107 : return 32 ;
+    case  168105 : return 31 ;
+    case  168104 : return 30 ;
+    case  168103 : return 29 ;
+    case  168076 : return 28 ;
+    case  168069 : return 27 ;
+    case  168068 : return 26 ;
+    case  168066 : return 25 ;
+    case  167988 : return 24 ;
+    case  167987 : return 23 ;
+    case  167986 : return 22 ;
+    case  167985 : return 21 ;
+    case  167921 : return 20 ;
+    case  167920 : return 19 ;
+    case  167915 : return 18 ;
+    case  167909 : return 17 ;
+    case  167903 : return 16 ;
+    case  167902 : return 15 ;
+    case  167818 : return 14 ;
+    case  167814 : return 13 ;
+    case  167813 : return 12 ;
+    case  167808 : return 11 ;
+    case  167807 : return 10 ;
+    case  167806 : return 9 ;
+    case  167713 : return 8 ;
+    case  167712 : return 7 ;
+    case  167711 : return 6 ;
+    case  167706 : return 5 ;
+    case  167693 : return 4 ;
+    case  166532 : return 3 ;
+    case  166530 : return 2 ;
+    case  166529 : return 1 ;
+
+    default : return 199;
+    }
+  }
+  if( kLHC10h == fPeriod ) {
+    switch(run){
+    case  139517 : return 137;
+    case  139514 : return 136;
+    case  139513 : return 135;
+    case  139511 : return 134;
+    case  139510 : return 133;
+    case  139507 : return 132;
+    case  139505 : return 131;
+    case  139504 : return 130;
+    case  139503 : return 129;
+    case  139470 : return 128;
+    case  139467 : return 127;
+    case  139466 : return 126;
+    case  139465 : return 125;
+    case  139440 : return 124;
+    case  139439 : return 123;
+    case  139438 : return 122;
+    case  139437 : return 121;
+    case  139360 : return 120;
+    case  139329 : return 119;
+    case  139328 : return 118;
+    case  139314 : return 117;
+    case  139311 : return 116;
+    case  139310 : return 115;
+    case  139309 : return 114;
+    case  139308 : return 113;
+    case  139173 : return 112;
+    case  139172 : return 111;
+    case  139110 : return 110;
+    case  139107 : return 109;
+    case  139105 : return 108;
+    case  139104 : return 107;
+    case  139042 : return 106;
+    case  139038 : return 105;
+    case  139037 : return 104;
+    case  139036 : return 103;
+    case  139029 : return 102;
+    case  139028 : return 101;
+    case  138983 : return 100;
+    case  138982 : return 99;
+    case  138980 : return 98;
+    case  138979 : return 97;
+    case  138978 : return 96;
+    case  138977 : return 95;
+    case  138976 : return 94;
+    case  138973 : return 93;
+    case  138972 : return 92;
+    case  138965 : return 91;
+    case  138924 : return 90;
+    case  138872 : return 89;
+    case  138871 : return 88;
+    case  138870 : return 87;
+    case  138837 : return 86;
+    case  138830 : return 85;
+    case  138828 : return 84;
+    case  138826 : return 83;
+    case  138796 : return 82;
+    case  138795 : return 81;
+    case  138742 : return 80;
+    case  138732 : return 79;
+    case  138730 : return 78;
+    case  138666 : return 77;
+    case  138662 : return 76;
+    case  138653 : return 75;
+    case  138652 : return 74;
+    case  138638 : return 73;
+    case  138624 : return 72;
+    case  138621 : return 71;
+    case  138583 : return 70;
+    case  138582 : return 69;
+    case  138579 : return 68;
+    case  138578 : return 67;
+    case  138534 : return 66;
+    case  138469 : return 65;
+    case  138442 : return 64;
+    case  138439 : return 63;
+    case  138438 : return 62;
+    case  138396 : return 61;
+    case  138364 : return 60;
+    case  138359 : return 59;
+    case  138275 : return 58;
+    case  138225 : return 57;
+    case  138201 : return 56;
+    case  138200 : return 55;
+    case  138197 : return 54;
+    case  138192 : return 53;
+    case  138190 : return 52;
+    case  138154 : return 51;
+    case  138153 : return 50;
+    case  138151 : return 49;
+    case  138150 : return 48;
+    case  138126 : return 47;
+    case  138125 : return 46;
+    case  137848 : return 45;
+    case  137847 : return 44;
+    case  137844 : return 43;
+    case  137843 : return 42;
+    case  137752 : return 41;
+    case  137751 : return 40;
+    case  137748 : return 39;
+    case  137724 : return 38;
+    case  137722 : return 37;
+    case  137718 : return 36;
+    case  137704 : return 35;
+    case  137693 : return 34;
+    case  137692 : return 33;
+    case  137691 : return 32;
+    case  137689 : return 31;
+    case  137686 : return 30;
+    case  137685 : return 29;
+    case  137639 : return 28;
+    case  137638 : return 27;
+    case  137608 : return 26;
+    case  137595 : return 25;
+    case  137549 : return 24;
+    case  137546 : return 23;
+    case  137544 : return 22;
+    case  137541 : return 21;
+    case  137539 : return 20;
+    case  137531 : return 19;
+    case  137530 : return 18;
+    case  137443 : return 17;
+    case  137441 : return 16;
+    case  137440 : return 15;
+    case  137439 : return 14;
+    case  137434 : return 13;
+    case  137432 : return 12;
+    case  137431 : return 11;
+    case  137430 : return 10;
+    case  137366 : return 9;
+    case  137243 : return 8;
+    case  137236 : return 7;
+    case  137235 : return 6;
+    case  137232 : return 5;
+    case  137231 : return 4;
+    case  137165 : return 3;
+    case  137162 : return 2;
+    case  137161 : return 1;
+    default : return 199;
+    }
+  }
+  if(kUndefinedPeriod && fDebug > 0) {
+    AliWarning("Period not defined");
+  }
+  return 1;
 }
 //_____________________________________________________________________________
 Bool_t AliAnalysisTaskPi0Flow::TestLambda(Double_t pt,Double_t l1,Double_t l2){
-  
+
   Double_t l2Mean  = 1.53126+9.50835e+06/(1.+1.08728e+07*pt+1.73420e+06*pt*pt) ;
   Double_t l1Mean  = 1.12365+0.123770*TMath::Exp(-pt*0.246551)+5.30000e-03*pt ;
   Double_t l2Sigma = 6.48260e-02+7.60261e+10/(1.+1.53012e+11*pt+5.01265e+05*pt*pt)+9.00000e-03*pt;
   Double_t l1Sigma = 4.44719e-04+6.99839e-01/(1.+1.22497e+00*pt+6.78604e-07*pt*pt)+9.00000e-03*pt;
   Double_t c=-0.35-0.550*TMath::Exp(-0.390730*pt) ;
-  Double_t R2=0.5*(l1-l1Mean)*(l1-l1Mean)/l1Sigma/l1Sigma + 
-              0.5*(l2-l2Mean)*(l2-l2Mean)/l2Sigma/l2Sigma +
-              0.5*c*(l1-l1Mean)*(l2-l2Mean)/l1Sigma/l2Sigma ;
+  Double_t R2=0.5*(l1-l1Mean)*(l1-l1Mean)/l1Sigma/l1Sigma +
+    0.5*(l2-l2Mean)*(l2-l2Mean)/l2Sigma/l2Sigma +
+    0.5*c*(l1-l1Mean)*(l2-l2Mean)/l1Sigma/l2Sigma ;
   return (R2<2.5*2.5) ;
-  
+
 }
 //_____________________________________________________________________________
 Bool_t AliAnalysisTaskPi0Flow::TestLambda2(Double_t pt,Double_t l1,Double_t l2){
-  
+
   Double_t l2Mean  = 1.53126+9.50835e+06/(1.+1.08728e+07*pt+1.73420e+06*pt*pt) ;
   Double_t l1Mean  = 1.12365+0.123770*TMath::Exp(-pt*0.246551)+5.30000e-03*pt ;
   Double_t l2Sigma = 6.48260e-02+7.60261e+10/(1.+1.53012e+11*pt+5.01265e+05*pt*pt)+9.00000e-03*pt;
   Double_t l1Sigma = 4.44719e-04+6.99839e-01/(1.+1.22497e+00*pt+6.78604e-07*pt*pt)+9.00000e-03*pt;
   Double_t c=-0.35-0.550*TMath::Exp(-0.390730*pt) ;
-  Double_t R2=0.5*(l1-l1Mean)*(l1-l1Mean)/l1Sigma/l1Sigma + 
-              0.5*(l2-l2Mean)*(l2-l2Mean)/l2Sigma/l2Sigma +
-              0.5*c*(l1-l1Mean)*(l2-l2Mean)/l1Sigma/l2Sigma ;
+  Double_t R2=0.5*(l1-l1Mean)*(l1-l1Mean)/l1Sigma/l1Sigma +
+    0.5*(l2-l2Mean)*(l2-l2Mean)/l2Sigma/l2Sigma +
+    0.5*c*(l1-l1Mean)*(l2-l2Mean)/l1Sigma/l2Sigma ;
   return (R2<1.5*1.5) ;
-  
+
 }
 //____________________________________________________________________________
+TList* AliAnalysisTaskPi0Flow::GetCaloPhotonsPHOSList(UInt_t vtxBin, UInt_t centBin, UInt_t rpBin)
+{
+  int offset = vtxBin * GetNumberOfCentralityBins() * fNEMRPBins
+             + centBin * fNEMRPBins
+             + rpBin;
+  if( fCaloPhotonsPHOSLists->At(offset) ) { // list exists
+    TList* list = dynamic_cast<TList*> (fCaloPhotonsPHOSLists->At(offset));
+    if( ! list )
+      AliError("object in fCaloPhotonsPHOSLists at %i did not cast");
+    return list;
+  }
+  else {// no list for this bin has been created, yet
+    TList* list = new TList();
+    list->SetOwner();
+    fCaloPhotonsPHOSLists->AddAt(list, offset);
+    return list;
+  }
+}
+
+//____________________________________________________________________________
 Double_t AliAnalysisTaskPi0Flow::TestCPV(Double_t dx, Double_t dz, Double_t pt, Int_t charge){
   //Parameterization of LHC10h period
   //_true if neutral_
-  
+
   Double_t meanX=0;
   Double_t meanZ=0.;
   Double_t sx=TMath::Min(5.4,2.59719e+02*TMath::Exp(-pt/1.02053e-01)+
-              6.58365e-01*5.91917e-01*5.91917e-01/((pt-9.61306e-01)*(pt-9.61306e-01)+5.91917e-01*5.91917e-01)+1.59219);
+                        6.58365e-01*5.91917e-01*5.91917e-01/((pt-9.61306e-01)*(pt-9.61306e-01)+5.91917e-01*5.91917e-01)+1.59219);
   Double_t sz=TMath::Min(2.75,4.90341e+02*1.91456e-02*1.91456e-02/(pt*pt+1.91456e-02*1.91456e-02)+1.60) ;
-  AliESDEvent *event = dynamic_cast<AliESDEvent*>(InputEvent());
+  AliVEvent *event = InputEvent();
   Double_t mf = 0.; //
   if(event) mf = event->GetMagneticField(); //Positive for ++ and negative for --
 
@@ -1513,7 +1836,7 @@ Double_t AliAnalysisTaskPi0Flow::TestCPV(Double_t dx, Double_t dz, Double_t pt,
     if(charge>0)
       meanX=-TMath::Min(8.0,3.86040*1.31357*1.31357/(pt*pt+1.31357*1.31357)+0.880579+7.56199e+06*TMath::Exp(-pt*3.08451e+01)) ;
     else
-      meanX= TMath::Min(6.85, 3.89994*1.16240*1.16240/(pt*pt+1.16240*1.16240)-0.120787+2.20275e+05*TMath::Exp(-pt*2.40913e+01)) ;     
+      meanX= TMath::Min(6.85, 3.89994*1.16240*1.16240/(pt*pt+1.16240*1.16240)-0.120787+2.20275e+05*TMath::Exp(-pt*2.40913e+01)) ;
   }
 
   Double_t rz=(dz-meanZ)/sz ;
@@ -1525,503 +1848,503 @@ Double_t  AliAnalysisTaskPi0Flow::ApplyFlatteningV0A(Double_t phi, Double_t c){
   //LHC10h
 
   Double_t v2c =0.;
-  Double_t v2s =0; 
+  Double_t v2s =0;
 
-if(fRunNumber==1){
+if(fInternalRunNumber==1){
   v2c=0.00271301 + (0.00340046)*c + (-0.000376369)*c*c + (8.56362e-06)*c*c*c + (-5.70955e-08)*c*c*c*c ;
   v2s=0.024278 + (0.000586593)*c + (-1.07748e-06)*c*c + (-5.01567e-07)*c*c*c + (3.65956e-09)*c*c*c*c ;
 }
-if(fRunNumber==2){
+if(fInternalRunNumber==2){
   v2c=0.111374 + (-0.0111331)*c + (0.000212342)*c*c + (-9.6774e-07)*c*c*c + (-2.54199e-09)*c*c*c*c ;
   v2s=-0.0252636 + (0.0152193)*c + (-0.000830793)*c*c + (1.5099e-05)*c*c*c + (-9.04687e-08)*c*c*c*c ;
 }
-if(fRunNumber==4){
+if(fInternalRunNumber==4){
   v2c=-0.0323376 + (0.0058672)*c + (-0.000257135)*c*c + (3.54353e-06)*c*c*c + (-1.50431e-08)*c*c*c*c ;
   v2s=0.0596758 + (-0.00520203)*c + (0.000178495)*c*c + (-2.94143e-06)*c*c*c + (1.55424e-08)*c*c*c*c ;
 }
-if(fRunNumber==5){
+if(fInternalRunNumber==5){
   v2c=-0.0415369 + (0.0098273)*c + (-0.000486907)*c*c + (8.00188e-06)*c*c*c + (-4.29107e-08)*c*c*c*c ;
   v2s=-0.0146049 + (0.00693627)*c + (-0.000348663)*c*c + (5.79331e-06)*c*c*c + (-3.33179e-08)*c*c*c*c ;
 }
-if(fRunNumber==6){
+if(fInternalRunNumber==6){
   v2c=0.251902 + (-0.0415419)*c + (0.0018553)*c*c + (-3.15181e-05)*c*c*c + (1.80073e-07)*c*c*c*c ;
   v2s=0.0771839 + (-0.00962468)*c + (0.000394453)*c*c + (-7.22485e-06)*c*c*c + (4.53562e-08)*c*c*c*c ;
 }
-if(fRunNumber==7){
+if(fInternalRunNumber==7){
   v2c=0.157038 + (-0.0204377)*c + (0.000847477)*c*c + (-1.4232e-05)*c*c*c + (8.04965e-08)*c*c*c*c ;
   v2s=0.0256337 + (-0.00242333)*c + (0.000140455)*c*c + (-3.5149e-06)*c*c*c + (2.44854e-08)*c*c*c*c ;
 }
-if(fRunNumber==8){
+if(fInternalRunNumber==8){
   v2c=-0.0916108 + (0.0146996)*c + (-0.000624971)*c*c + (9.63331e-06)*c*c*c + (-4.8574e-08)*c*c*c*c ;
   v2s=0.0332113 + (-0.00332475)*c + (0.000151857)*c*c + (-2.86187e-06)*c*c*c + (1.54796e-08)*c*c*c*c ;
 }
-if(fRunNumber==9){
+if(fInternalRunNumber==9){
   v2c=0.00925348 + (1.58854e-05)*c + (-3.85178e-05)*c*c + (6.75167e-07)*c*c*c + (-3.1502e-09)*c*c*c*c ;
   v2s=0.0249253 + (-0.00300902)*c + (0.000152653)*c*c + (-3.20923e-06)*c*c*c + (2.08818e-08)*c*c*c*c ;
 }
-if(fRunNumber==10){
+if(fInternalRunNumber==10){
   v2c=0.040903 + (0.00142711)*c + (-0.000264675)*c*c + (6.50624e-06)*c*c*c + (-4.46628e-08)*c*c*c*c ;
   v2s=0.0914196 + (-0.00957901)*c + (0.000408998)*c*c + (-7.49412e-06)*c*c*c + (4.63915e-08)*c*c*c*c ;
 }
-if(fRunNumber==11){
+if(fInternalRunNumber==11){
   v2c=-0.0130133 + (0.00296474)*c + (-0.000183518)*c*c + (3.65755e-06)*c*c*c + (-2.24484e-08)*c*c*c*c ;
   v2s=-0.00449031 + (0.00365474)*c + (-0.000226455)*c*c + (4.49792e-06)*c*c*c + (-2.96018e-08)*c*c*c*c ;
 }
-if(fRunNumber==12){
+if(fInternalRunNumber==12){
   v2c=-0.021987 + (0.00506675)*c + (-0.000301768)*c*c + (5.66088e-06)*c*c*c + (-3.21447e-08)*c*c*c*c ;
   v2s=0.0830858 + (-0.00871637)*c + (0.000299212)*c*c + (-4.10705e-06)*c*c*c + (1.76888e-08)*c*c*c*c ;
 }
-if(fRunNumber==13){
+if(fInternalRunNumber==13){
   v2c=0.0502952 + (-0.00152478)*c + (-0.000106289)*c*c + (3.39398e-06)*c*c*c + (-2.45015e-08)*c*c*c*c ;
   v2s=0.0639936 + (-0.00775191)*c + (0.000347449)*c*c + (-6.46454e-06)*c*c*c + (4.00439e-08)*c*c*c*c ;
 }
-if(fRunNumber==14){
+if(fInternalRunNumber==14){
   v2c=-0.116922 + (0.0122105)*c + (-0.000373923)*c*c + (4.08464e-06)*c*c*c + (-1.05659e-08)*c*c*c*c ;
   v2s=0.128821 + (-0.0204399)*c + (0.000831009)*c*c + (-1.33147e-05)*c*c*c + (7.24876e-08)*c*c*c*c ;
 }
-if(fRunNumber==15){
+if(fInternalRunNumber==15){
   v2c=0.0853741 + (-0.00924528)*c + (0.00034257)*c*c + (-5.69551e-06)*c*c*c + (3.44998e-08)*c*c*c*c ;
   v2s=0.0205492 + (-0.00052015)*c + (-5.42051e-05)*c*c + (1.82754e-06)*c*c*c + (-1.58393e-08)*c*c*c*c ;
 }
-if(fRunNumber==16){
+if(fInternalRunNumber==16){
   v2c=-0.0233639 + (0.00703612)*c + (-0.000403314)*c*c + (7.45693e-06)*c*c*c + (-4.4522e-08)*c*c*c*c ;
   v2s=-0.0712605 + (0.0124469)*c + (-0.000543644)*c*c + (8.22618e-06)*c*c*c + (-4.1073e-08)*c*c*c*c ;
 }
-if(fRunNumber==17){
+if(fInternalRunNumber==17){
   v2c=0.0113215 + (-0.0019788)*c + (9.81834e-05)*c*c + (-1.30009e-06)*c*c*c + (5.03998e-09)*c*c*c*c ;
   v2s=0.0459851 + (-0.00170929)*c + (-5.96459e-05)*c*c + (2.90146e-06)*c*c*c + (-2.85325e-08)*c*c*c*c ;
 }
-if(fRunNumber==18){
+if(fInternalRunNumber==18){
   v2c=-0.0924521 + (0.0162203)*c + (-0.000702717)*c*c + (1.0269e-05)*c*c*c + (-4.632e-08)*c*c*c*c ;
   v2s=-0.0456605 + (0.00706138)*c + (-0.000243957)*c*c + (2.7335e-06)*c*c*c + (-8.83296e-09)*c*c*c*c ;
 }
-if(fRunNumber==19){
+if(fInternalRunNumber==19){
   v2c=0.00150974 + (0.0113356)*c + (-0.000923111)*c*c + (2.0452e-05)*c*c*c + (-1.36949e-07)*c*c*c*c ;
   v2s=0.0673845 + (-0.0187379)*c + (0.00112044)*c*c + (-2.19997e-05)*c*c*c + (1.33115e-07)*c*c*c*c ;
 }
-if(fRunNumber==20){
+if(fInternalRunNumber==20){
   v2c=0.0223891 + (-0.000921021)*c + (-3.56276e-05)*c*c + (9.95622e-07)*c*c*c + (-5.54486e-09)*c*c*c*c ;
   v2s=0.0657305 + (-0.00354234)*c + (2.90428e-05)*c*c + (5.82994e-07)*c*c*c + (-7.53656e-09)*c*c*c*c ;
 }
-if(fRunNumber==21){
+if(fInternalRunNumber==21){
   v2c=0.00969434 + (-0.00195313)*c + (3.56409e-05)*c*c + (2.15514e-07)*c*c*c + (-5.5161e-09)*c*c*c*c ;
   v2s=0.000236584 + (0.00458234)*c + (-0.000306408)*c*c + (6.04476e-06)*c*c*c + (-3.79354e-08)*c*c*c*c ;
 }
-if(fRunNumber==22){
+if(fInternalRunNumber==22){
   v2c=0.0973536 + (-0.00907174)*c + (0.000239041)*c*c + (-2.64399e-06)*c*c*c + (1.12038e-08)*c*c*c*c ;
   v2s=0.0506578 + (-0.00256521)*c + (1.53982e-05)*c*c + (4.18193e-07)*c*c*c + (-4.99622e-09)*c*c*c*c ;
 }
-if(fRunNumber==23){
+if(fInternalRunNumber==23){
   v2c=0.120714 + (-0.0190965)*c + (0.000887955)*c*c + (-1.57144e-05)*c*c*c + (9.22823e-08)*c*c*c*c ;
   v2s=-0.00178837 + (0.00377706)*c + (-0.000358619)*c*c + (9.54949e-06)*c*c*c + (-7.39141e-08)*c*c*c*c ;
 }
-if(fRunNumber==24){
+if(fInternalRunNumber==24){
   v2c=0.0593053 + (-0.00687397)*c + (0.000200607)*c*c + (-2.34483e-06)*c*c*c + (9.60642e-09)*c*c*c*c ;
   v2s=0.0235174 + (0.00219788)*c + (-0.000225065)*c*c + (4.9594e-06)*c*c*c + (-3.2695e-08)*c*c*c*c ;
 }
-if(fRunNumber==25){
+if(fInternalRunNumber==25){
   v2c=0.0551353 + (-0.00340874)*c + (2.26718e-05)*c*c + (4.1675e-07)*c*c*c + (-3.37457e-09)*c*c*c*c ;
   v2s=0.0110038 + (-0.000180543)*c + (3.28645e-05)*c*c + (-1.08119e-06)*c*c*c + (6.7157e-09)*c*c*c*c ;
 }
-if(fRunNumber==26){
+if(fInternalRunNumber==26){
   v2c=-0.0138673 + (0.00475006)*c + (-0.00030584)*c*c + (6.0294e-06)*c*c*c + (-3.69906e-08)*c*c*c*c ;
   v2s=0.0395065 + (-0.00331262)*c + (9.40592e-05)*c*c + (-1.1541e-06)*c*c*c + (4.38329e-09)*c*c*c*c ;
 }
-if(fRunNumber==27){
+if(fInternalRunNumber==27){
   v2c=0.0547504 + (-0.00669067)*c + (0.000269785)*c*c + (-4.75217e-06)*c*c*c + (2.96254e-08)*c*c*c*c ;
   v2s=0.101508 + (-0.0107211)*c + (0.000385539)*c*c + (-6.28713e-06)*c*c*c + (3.75932e-08)*c*c*c*c ;
 }
-if(fRunNumber==28){
+if(fInternalRunNumber==28){
   v2c=-0.102173 + (0.0158262)*c + (-0.000706394)*c*c + (1.14263e-05)*c*c*c + (-6.14646e-08)*c*c*c*c ;
   v2s=0.02013 + (9.82197e-05)*c + (-1.71572e-05)*c*c + (-7.69646e-08)*c*c*c + (1.45113e-09)*c*c*c*c ;
 }
-if(fRunNumber==29){
+if(fInternalRunNumber==29){
   v2c=0.100539 + (-0.0115012)*c + (0.000295367)*c*c + (-2.57489e-06)*c*c*c + (5.41526e-09)*c*c*c*c ;
   v2s=0.138027 + (-0.00342397)*c + (-0.000392569)*c*c + (1.34626e-05)*c*c*c + (-1.06683e-07)*c*c*c*c ;
 }
-if(fRunNumber==30){
+if(fInternalRunNumber==30){
   v2c=0.0695326 + (-0.00752755)*c + (0.000237872)*c*c + (-3.31513e-06)*c*c*c + (1.69653e-08)*c*c*c*c ;
   v2s=0.0290133 + (-0.00073999)*c + (-3.35653e-05)*c*c + (7.61029e-07)*c*c*c + (-2.95792e-09)*c*c*c*c ;
 }
-if(fRunNumber==31){
+if(fInternalRunNumber==31){
   v2c=-0.103171 + (0.0134058)*c + (-0.000631602)*c*c + (1.10298e-05)*c*c*c + (-6.41177e-08)*c*c*c*c ;
   v2s=-0.137648 + (0.0111259)*c + (-0.000400035)*c*c + (5.90535e-06)*c*c*c + (-3.24676e-08)*c*c*c*c ;
 }
-if(fRunNumber==32){
+if(fInternalRunNumber==32){
   v2c=0.0522957 + (-0.00718492)*c + (0.000288586)*c*c + (-5.14534e-06)*c*c*c + (3.31303e-08)*c*c*c*c ;
   v2s=0.0731685 + (-0.00469449)*c + (9.57641e-05)*c*c + (-1.11891e-06)*c*c*c + (6.13984e-09)*c*c*c*c ;
 }
-if(fRunNumber==33){
+if(fInternalRunNumber==33){
   v2c=0.0882828 + (-0.00916109)*c + (0.00027821)*c*c + (-3.61312e-06)*c*c*c + (1.76418e-08)*c*c*c*c ;
   v2s=0.123302 + (-0.0156303)*c + (0.000623468)*c*c + (-9.83474e-06)*c*c*c + (5.24687e-08)*c*c*c*c ;
 }
-if(fRunNumber==34){
+if(fInternalRunNumber==34){
   v2c=0.0848636 + (-0.0142808)*c + (0.000723319)*c*c + (-1.32627e-05)*c*c*c + (7.77064e-08)*c*c*c*c ;
   v2s=-0.138483 + (0.0268553)*c + (-0.0013585)*c*c + (2.56034e-05)*c*c*c + (-1.63065e-07)*c*c*c*c ;
 }
-if(fRunNumber==35){
+if(fInternalRunNumber==35){
   v2c=-0.0134575 + (0.00267433)*c + (-0.000168784)*c*c + (3.24012e-06)*c*c*c + (-1.92766e-08)*c*c*c*c ;
   v2s=0.0596795 + (-0.00350808)*c + (2.97282e-05)*c*c + (3.52115e-07)*c*c*c + (-4.17462e-09)*c*c*c*c ;
 }
-if(fRunNumber==36){
+if(fInternalRunNumber==36){
   v2c=0.0784813 + (-0.00718389)*c + (0.000145303)*c*c + (-1.40121e-06)*c*c*c + (7.52775e-09)*c*c*c*c ;
   v2s=-0.0439181 + (0.0101363)*c + (-0.000494075)*c*c + (8.43356e-06)*c*c*c + (-4.68549e-08)*c*c*c*c ;
 }
-if(fRunNumber==37){
+if(fInternalRunNumber==37){
   v2c=-0.0118549 + (0.00328751)*c + (-0.000207156)*c*c + (3.92678e-06)*c*c*c + (-2.30059e-08)*c*c*c*c ;
   v2s=0.0344878 + (-0.000363669)*c + (-7.62481e-05)*c*c + (1.67135e-06)*c*c*c + (-9.64004e-09)*c*c*c*c ;
 }
-if(fRunNumber==38){
+if(fInternalRunNumber==38){
   v2c=-0.0254171 + (0.00297494)*c + (-0.000122361)*c*c + (1.78861e-06)*c*c*c + (-7.87609e-09)*c*c*c*c ;
   v2s=-0.0321399 + (0.00705636)*c + (-0.000325906)*c*c + (5.17669e-06)*c*c*c + (-2.86143e-08)*c*c*c*c ;
 }
-if(fRunNumber==39){
+if(fInternalRunNumber==39){
   v2c=-0.0368721 + (0.00253133)*c + (-0.000136793)*c*c + (2.51874e-06)*c*c*c + (-1.46055e-08)*c*c*c*c ;
   v2s=-0.0757763 + (0.005728)*c + (-0.000217489)*c*c + (3.11936e-06)*c*c*c + (-1.56919e-08)*c*c*c*c ;
 }
-if(fRunNumber==40){
+if(fInternalRunNumber==40){
   v2c=0.0166884 + (0.000509256)*c + (-0.000117911)*c*c + (2.65839e-06)*c*c*c + (-1.60875e-08)*c*c*c*c ;
   v2s=0.0336629 + (-0.00123023)*c + (-4.90123e-05)*c*c + (2.17862e-06)*c*c*c + (-1.98445e-08)*c*c*c*c ;
 }
-if(fRunNumber==41){
+if(fInternalRunNumber==41){
   v2c=-0.00887514 + (0.00491344)*c + (-0.000325782)*c*c + (6.54782e-06)*c*c*c + (-4.14143e-08)*c*c*c*c ;
   v2s=0.0720999 + (-0.00650524)*c + (0.000214752)*c*c + (-3.19681e-06)*c*c*c + (1.64573e-08)*c*c*c*c ;
 }
-if(fRunNumber==42){
+if(fInternalRunNumber==42){
   v2c=-0.0495903 + (0.00428229)*c + (-0.000181618)*c*c + (2.3913e-06)*c*c*c + (-8.55469e-09)*c*c*c*c ;
   v2s=0.0127982 + (-0.00690065)*c + (0.000342707)*c*c + (-6.40515e-06)*c*c*c + (3.83973e-08)*c*c*c*c ;
 }
-if(fRunNumber==43){
+if(fInternalRunNumber==43){
   v2c=0.0196783 + (-0.000221524)*c + (-7.09556e-05)*c*c + (1.76517e-06)*c*c*c + (-1.19612e-08)*c*c*c*c ;
   v2s=0.0350359 + (-0.0020458)*c + (5.18727e-05)*c*c + (-6.58401e-07)*c*c*c + (1.10936e-09)*c*c*c*c ;
 }
-if(fRunNumber==44){
+if(fInternalRunNumber==44){
   v2c=-0.0196041 + (0.00257682)*c + (-0.000174854)*c*c + (3.2168e-06)*c*c*c + (-1.85569e-08)*c*c*c*c ;
   v2s=-0.0870278 + (0.00634528)*c + (-0.000273588)*c*c + (4.77944e-06)*c*c*c + (-2.98422e-08)*c*c*c*c ;
 }
-if(fRunNumber==45){
+if(fInternalRunNumber==45){
   v2c=-0.0105827 + (0.00271714)*c + (-0.000152357)*c*c + (2.71899e-06)*c*c*c + (-1.5435e-08)*c*c*c*c ;
   v2s=0.135579 + (-0.0135952)*c + (0.000424184)*c*c + (-5.12316e-06)*c*c*c + (1.84497e-08)*c*c*c*c ;
 }
-if(fRunNumber==46){
+if(fInternalRunNumber==46){
   v2c=-0.017755 + (0.00411137)*c + (-0.000231724)*c*c + (4.17641e-06)*c*c*c + (-2.39164e-08)*c*c*c*c ;
   v2s=-0.0198628 + (0.0010032)*c + (-4.9708e-05)*c*c + (7.12455e-07)*c*c*c + (-4.22231e-09)*c*c*c*c ;
 }
-if(fRunNumber==47){
+if(fInternalRunNumber==47){
   v2c=-0.0111387 + (0.00258591)*c + (-0.000194287)*c*c + (3.84062e-06)*c*c*c + (-2.37192e-08)*c*c*c*c ;
   v2s=-0.0478616 + (0.00365349)*c + (-0.000152037)*c*c + (2.24323e-06)*c*c*c + (-1.23308e-08)*c*c*c*c ;
 }
-if(fRunNumber==48){
+if(fInternalRunNumber==48){
   v2c=0.070344 + (-0.0137332)*c + (0.000638536)*c*c + (-1.188e-05)*c*c*c + (7.4801e-08)*c*c*c*c ;
   v2s=-0.00208823 + (-0.00314157)*c + (9.9553e-05)*c*c + (-8.73891e-07)*c*c*c + (-1.72944e-09)*c*c*c*c ;
 }
-if(fRunNumber==51){
+if(fInternalRunNumber==51){
   v2c=0.017789 + (-0.00598224)*c + (0.000328477)*c*c + (-6.80787e-06)*c*c*c + (4.46905e-08)*c*c*c*c ;
   v2s=-0.0894734 + (0.007351)*c + (-0.000291085)*c*c + (4.38654e-06)*c*c*c + (-2.32261e-08)*c*c*c*c ;
 }
-if(fRunNumber==52){
+if(fInternalRunNumber==52){
   v2c=0.0555614 + (-0.00430576)*c + (0.00011519)*c*c + (-1.81584e-06)*c*c*c + (1.19214e-08)*c*c*c*c ;
   v2s=0.0901479 + (-0.0091505)*c + (0.000343757)*c*c + (-5.71204e-06)*c*c*c + (3.31217e-08)*c*c*c*c ;
 }
-if(fRunNumber==53){
+if(fInternalRunNumber==53){
   v2c=0.0181761 + (-0.00186378)*c + (4.60531e-05)*c*c + (-7.59581e-07)*c*c*c + (5.52465e-09)*c*c*c*c ;
   v2s=0.0456713 + (-0.00526813)*c + (0.000232978)*c*c + (-3.98724e-06)*c*c*c + (2.10384e-08)*c*c*c*c ;
 }
-if(fRunNumber==54){
+if(fInternalRunNumber==54){
   v2c=0.0456225 + (-0.00611173)*c + (0.000228414)*c*c + (-3.70527e-06)*c*c*c + (2.10774e-08)*c*c*c*c ;
   v2s=-0.00553874 + (0.00501799)*c + (-0.000331323)*c*c + (6.96978e-06)*c*c*c + (-4.72472e-08)*c*c*c*c ;
 }
-if(fRunNumber==55){
+if(fInternalRunNumber==55){
   v2c=-0.0578879 + (0.00664986)*c + (-0.000335443)*c*c + (6.0086e-06)*c*c*c + (-3.54293e-08)*c*c*c*c ;
   v2s=-0.0675269 + (0.00407581)*c + (-0.000148063)*c*c + (1.922e-06)*c*c*c + (-8.8635e-09)*c*c*c*c ;
 }
-if(fRunNumber==56){
+if(fInternalRunNumber==56){
   v2c=-0.000898903 + (0.00199222)*c + (-0.000207257)*c*c + (4.46148e-06)*c*c*c + (-2.71361e-08)*c*c*c*c ;
   v2s=-0.103794 + (0.0198667)*c + (-0.000879042)*c*c + (1.43177e-05)*c*c*c + (-8.09672e-08)*c*c*c*c ;
 }
-if(fRunNumber==57){
+if(fInternalRunNumber==57){
   v2c=0.00953087 + (0.000947327)*c + (-3.45822e-05)*c*c + (-4.22294e-07)*c*c*c + (9.08727e-09)*c*c*c*c ;
   v2s=0.0662314 + (-0.0076136)*c + (0.000288482)*c*c + (-4.82931e-06)*c*c*c + (2.67751e-08)*c*c*c*c ;
 }
-if(fRunNumber==58){
+if(fInternalRunNumber==58){
   v2c=0.00682728 + (-0.000293407)*c + (-2.88037e-05)*c*c + (6.63629e-07)*c*c*c + (-3.93121e-09)*c*c*c*c ;
   v2s=0.0085365 + (0.00138919)*c + (-8.15068e-05)*c*c + (1.26437e-06)*c*c*c + (-7.50322e-09)*c*c*c*c ;
 }
-if(fRunNumber==59){
+if(fInternalRunNumber==59){
   v2c=-0.0185226 + (0.00377881)*c + (-0.000226383)*c*c + (4.22897e-06)*c*c*c + (-2.51383e-08)*c*c*c*c ;
   v2s=-0.222605 + (0.0100699)*c + (-0.00029256)*c*c + (3.3855e-06)*c*c*c + (-1.33648e-08)*c*c*c*c ;
 }
-if(fRunNumber==60){
+if(fInternalRunNumber==60){
   v2c=-0.00111322 + (0.00291259)*c + (-0.000215769)*c*c + (4.13355e-06)*c*c*c + (-2.36883e-08)*c*c*c*c ;
   v2s=0.033686 + (-0.00124534)*c + (1.52616e-05)*c*c + (-2.99302e-07)*c*c*c + (1.05198e-09)*c*c*c*c ;
 }
-if(fRunNumber==61){
+if(fInternalRunNumber==61){
   v2c=0.00041873 + (-0.000231092)*c + (1.19226e-05)*c*c + (-6.29604e-07)*c*c*c + (7.26582e-09)*c*c*c*c ;
   v2s=0.00435438 + (0.0025265)*c + (-0.000153028)*c*c + (2.71169e-06)*c*c*c + (-1.67127e-08)*c*c*c*c ;
 }
-if(fRunNumber==62){
+if(fInternalRunNumber==62){
   v2c=-0.0573899 + (0.00972389)*c + (-0.000495772)*c*c + (9.0103e-06)*c*c*c + (-5.45756e-08)*c*c*c*c ;
   v2s=0.00702691 + (0.00698504)*c + (-0.000541929)*c*c + (1.19971e-05)*c*c*c + (-8.26942e-08)*c*c*c*c ;
 }
-if(fRunNumber==63){
+if(fInternalRunNumber==63){
   v2c=0.047222 + (-0.00604037)*c + (0.0002092)*c*c + (-3.07144e-06)*c*c*c + (1.68579e-08)*c*c*c*c ;
   v2s=0.0568815 + (-0.00607571)*c + (0.000244243)*c*c + (-4.22237e-06)*c*c*c + (2.38928e-08)*c*c*c*c ;
 }
-if(fRunNumber==64){
+if(fInternalRunNumber==64){
   v2c=0.0464686 + (-0.00463482)*c + (0.000146379)*c*c + (-2.23008e-06)*c*c*c + (1.29549e-08)*c*c*c*c ;
   v2s=-0.00571995 + (0.00273485)*c + (-0.000131945)*c*c + (2.08986e-06)*c*c*c + (-1.26717e-08)*c*c*c*c ;
 }
-if(fRunNumber==65){
+if(fInternalRunNumber==65){
   v2c=0.0544794 + (-0.00616918)*c + (0.000173808)*c*c + (-2.01338e-06)*c*c*c + (8.78123e-09)*c*c*c*c ;
   v2s=0.0557002 + (-0.00701287)*c + (0.000340418)*c*c + (-6.12754e-06)*c*c*c + (3.3384e-08)*c*c*c*c ;
 }
-if(fRunNumber==66){
+if(fInternalRunNumber==66){
   v2c=0.0111176 + (0.000262254)*c + (-7.20349e-05)*c*c + (1.38755e-06)*c*c*c + (-6.65016e-09)*c*c*c*c ;
   v2s=0.0644184 + (-0.00518515)*c + (0.000174227)*c*c + (-2.7347e-06)*c*c*c + (1.29547e-08)*c*c*c*c ;
 }
-if(fRunNumber==67){
+if(fInternalRunNumber==67){
   v2c=-0.0481037 + (0.00823686)*c + (-0.000418053)*c*c + (7.40186e-06)*c*c*c + (-4.19609e-08)*c*c*c*c ;
   v2s=0.0560171 + (-0.002556)*c + (2.54529e-05)*c*c + (-5.22269e-09)*c*c*c + (-2.19983e-09)*c*c*c*c ;
 }
-if(fRunNumber==68){
+if(fInternalRunNumber==68){
   v2c=-0.0139809 + (0.00274305)*c + (-0.00017744)*c*c + (3.20286e-06)*c*c*c + (-1.74137e-08)*c*c*c*c ;
   v2s=-0.218673 + (0.00764806)*c + (-0.000222739)*c*c + (3.14656e-06)*c*c*c + (-1.73548e-08)*c*c*c*c ;
 }
-if(fRunNumber==69){
+if(fInternalRunNumber==69){
   v2c=0.0736938 + (-0.0122004)*c + (0.000498227)*c*c + (-8.08779e-06)*c*c*c + (4.52749e-08)*c*c*c*c ;
   v2s=-0.236254 + (0.00979816)*c + (-0.000280698)*c*c + (3.4103e-06)*c*c*c + (-1.47299e-08)*c*c*c*c ;
 }
-if(fRunNumber==70){
+if(fInternalRunNumber==70){
   v2c=-0.0366545 + (0.00399604)*c + (-0.000196876)*c*c + (3.49686e-06)*c*c*c + (-2.01142e-08)*c*c*c*c ;
   v2s=0.0220911 + (-0.000529459)*c + (9.10408e-06)*c*c + (-3.57334e-07)*c*c*c + (1.87909e-09)*c*c*c*c ;
 }
-if(fRunNumber==71){
+if(fInternalRunNumber==71){
   v2c=-0.039698 + (0.00654615)*c + (-0.000323865)*c*c + (5.50998e-06)*c*c*c + (-3.00866e-08)*c*c*c*c ;
   v2s=0.0650078 + (-0.00502636)*c + (0.000128459)*c*c + (-1.3877e-06)*c*c*c + (3.21917e-09)*c*c*c*c ;
 }
-if(fRunNumber==72){
+if(fInternalRunNumber==72){
   v2c=0.0594227 + (-0.00872513)*c + (0.000368684)*c*c + (-6.34986e-06)*c*c*c + (3.79523e-08)*c*c*c*c ;
   v2s=0.050348 + (-0.00512087)*c + (0.000228643)*c*c + (-4.40797e-06)*c*c*c + (2.62482e-08)*c*c*c*c ;
 }
-if(fRunNumber==73){
+if(fInternalRunNumber==73){
   v2c=0.131281 + (-0.0162697)*c + (0.000584063)*c*c + (-8.64349e-06)*c*c*c + (4.61009e-08)*c*c*c*c ;
   v2s=0.0271721 + (-0.000487039)*c + (1.60624e-05)*c*c + (-5.38029e-07)*c*c*c + (2.08589e-09)*c*c*c*c ;
 }
-if(fRunNumber==74){
+if(fInternalRunNumber==74){
   v2c=-0.0128651 + (0.00946426)*c + (-0.00055547)*c*c + (9.37245e-06)*c*c*c + (-4.78224e-08)*c*c*c*c ;
   v2s=0.0903476 + (-0.0164972)*c + (0.000927481)*c*c + (-1.88459e-05)*c*c*c + (1.20249e-07)*c*c*c*c ;
 }
-if(fRunNumber==75){
+if(fInternalRunNumber==75){
   v2c=0.0204147 + (-0.00139139)*c + (-2.47732e-05)*c*c + (1.1214e-06)*c*c*c + (-7.22533e-09)*c*c*c*c ;
   v2s=0.0214247 + (-0.000147929)*c + (-7.58241e-06)*c*c + (-7.05565e-08)*c*c*c + (-4.86528e-10)*c*c*c*c ;
 }
-if(fRunNumber==76){
+if(fInternalRunNumber==76){
   v2c=0.0469095 + (-0.00541793)*c + (0.000133238)*c*c + (-1.14334e-06)*c*c*c + (3.4826e-09)*c*c*c*c ;
   v2s=0.0304763 + (-0.00213957)*c + (8.27588e-05)*c*c + (-1.34495e-06)*c*c*c + (4.81134e-09)*c*c*c*c ;
 }
-if(fRunNumber==77){
+if(fInternalRunNumber==77){
   v2c=0.113822 + (-0.0154286)*c + (0.000574533)*c*c + (-8.67874e-06)*c*c*c + (4.76727e-08)*c*c*c*c ;
   v2s=0.010623 + (0.00513467)*c + (-0.000372733)*c*c + (7.40692e-06)*c*c*c + (-4.64093e-08)*c*c*c*c ;
 }
-if(fRunNumber==78){
+if(fInternalRunNumber==78){
   v2c=0.020658 + (-0.00274725)*c + (5.8872e-05)*c*c + (-3.43999e-07)*c*c*c + (-1.04273e-10)*c*c*c*c ;
   v2s=0.00219379 + (0.000972033)*c + (-1.41816e-05)*c*c + (-4.41149e-07)*c*c*c + (3.81037e-09)*c*c*c*c ;
 }
-if(fRunNumber==79){
+if(fInternalRunNumber==79){
   v2c=0.227324 + (-0.0264915)*c + (0.000915298)*c*c + (-1.3343e-05)*c*c*c + (7.1044e-08)*c*c*c*c ;
   v2s=0.0474072 + (-0.00939515)*c + (0.000730108)*c*c + (-1.80811e-05)*c*c*c + (1.3003e-07)*c*c*c*c ;
 }
-if(fRunNumber==81){
+if(fInternalRunNumber==81){
   v2c=-0.0368028 + (0.00368927)*c + (-0.000228321)*c*c + (4.48174e-06)*c*c*c + (-2.75298e-08)*c*c*c*c ;
   v2s=-0.238807 + (0.0108667)*c + (-0.000350649)*c*c + (4.95568e-06)*c*c*c + (-2.53022e-08)*c*c*c*c ;
 }
-if(fRunNumber==82){
+if(fInternalRunNumber==82){
   v2c=-0.0214072 + (0.00119258)*c + (-7.80215e-05)*c*c + (1.37682e-06)*c*c*c + (-7.31103e-09)*c*c*c*c ;
   v2s=-0.233825 + (0.00735109)*c + (-0.000142737)*c*c + (9.15013e-07)*c*c*c + (-1.98463e-10)*c*c*c*c ;
 }
-if(fRunNumber==83){
+if(fInternalRunNumber==83){
   v2c=-0.0716708 + (0.00855289)*c + (-0.00037249)*c*c + (6.41638e-06)*c*c*c + (-3.66318e-08)*c*c*c*c ;
   v2s=-0.329702 + (0.033231)*c + (-0.00131012)*c*c + (2.1101e-05)*c*c*c + (-1.18905e-07)*c*c*c*c ;
 }
-if(fRunNumber==84){
+if(fInternalRunNumber==84){
   v2c=-0.0259022 + (0.00711773)*c + (-0.000434778)*c*c + (8.94774e-06)*c*c*c + (-5.84408e-08)*c*c*c*c ;
   v2s=-0.0936287 + (-0.00455282)*c + (0.000390982)*c*c + (-7.95224e-06)*c*c*c + (4.95612e-08)*c*c*c*c ;
 }
-if(fRunNumber==85){
+if(fInternalRunNumber==85){
   v2c=0.0263223 + (-0.00475593)*c + (9.63236e-05)*c*c + (-4.95311e-07)*c*c*c + (-5.47428e-10)*c*c*c*c ;
   v2s=-0.220593 + (0.00823892)*c + (-0.000248477)*c*c + (3.28082e-06)*c*c*c + (-1.45098e-08)*c*c*c*c ;
 }
-if(fRunNumber==86){
+if(fInternalRunNumber==86){
   v2c=-0.0157962 + (0.00408922)*c + (-0.000282087)*c*c + (5.81961e-06)*c*c*c + (-3.6481e-08)*c*c*c*c ;
   v2s=0.0340979 + (-0.00139471)*c + (6.48561e-06)*c*c + (3.02184e-08)*c*c*c + (-1.05879e-09)*c*c*c*c ;
 }
-if(fRunNumber==87){
+if(fInternalRunNumber==87){
   v2c=0.0577366 + (-0.00471394)*c + (0.000107329)*c*c + (-7.28927e-07)*c*c*c + (-1.51199e-09)*c*c*c*c ;
   v2s=0.0350171 + (-0.00402687)*c + (0.00016046)*c*c + (-2.39625e-06)*c*c*c + (9.98146e-09)*c*c*c*c ;
 }
-if(fRunNumber==88){
+if(fInternalRunNumber==88){
   v2c=-0.00547971 + (0.00161905)*c + (-0.00013831)*c*c + (2.94662e-06)*c*c*c + (-1.92504e-08)*c*c*c*c ;
   v2s=-0.0722251 + (0.0127634)*c + (-0.000612284)*c*c + (1.07553e-05)*c*c*c + (-6.34054e-08)*c*c*c*c ;
 }
-if(fRunNumber==89){
+if(fInternalRunNumber==89){
   v2c=0.165574 + (-0.0241913)*c + (0.00101221)*c*c + (-1.62279e-05)*c*c*c + (8.77252e-08)*c*c*c*c ;
   v2s=0.0692954 + (-0.0147219)*c + (0.00068782)*c*c + (-1.11091e-05)*c*c*c + (5.37295e-08)*c*c*c*c ;
 }
-if(fRunNumber==91){
+if(fInternalRunNumber==91){
   v2c=-0.0334666 + (0.00583866)*c + (-0.000329883)*c*c + (6.08932e-06)*c*c*c + (-3.59853e-08)*c*c*c*c ;
   v2s=-0.229775 + (0.010061)*c + (-0.00028144)*c*c + (3.3231e-06)*c*c*c + (-1.40799e-08)*c*c*c*c ;
 }
-if(fRunNumber==95){
+if(fInternalRunNumber==95){
   v2c=-0.0993203 + (0.0150547)*c + (-0.000713531)*c*c + (1.22733e-05)*c*c*c + (-6.98669e-08)*c*c*c*c ;
   v2s=-0.217746 + (0.0068375)*c + (-0.000171962)*c*c + (2.05506e-06)*c*c*c + (-8.78703e-09)*c*c*c*c ;
 }
-if(fRunNumber==96){
+if(fInternalRunNumber==96){
   v2c=-0.0398801 + (0.00406028)*c + (-0.000214066)*c*c + (3.69056e-06)*c*c*c + (-1.99339e-08)*c*c*c*c ;
   v2s=-0.240195 + (0.00782806)*c + (-0.000131365)*c*c + (3.18193e-07)*c*c*c + (4.88009e-09)*c*c*c*c ;
 }
-if(fRunNumber==97){
+if(fInternalRunNumber==97){
   v2c=-0.0325538 + (0.00250986)*c + (-0.000136762)*c*c + (2.35572e-06)*c*c*c + (-1.23413e-08)*c*c*c*c ;
   v2s=-0.240415 + (0.010435)*c + (-0.000291848)*c*c + (3.35357e-06)*c*c*c + (-1.35833e-08)*c*c*c*c ;
 }
-if(fRunNumber==98){
+if(fInternalRunNumber==98){
   v2c=-0.00692338 + (0.00379335)*c + (-0.000332833)*c*c + (7.35052e-06)*c*c*c + (-4.89956e-08)*c*c*c*c ;
   v2s=-0.263042 + (0.0134291)*c + (-0.000465334)*c*c + (7.09595e-06)*c*c*c + (-3.90332e-08)*c*c*c*c ;
 }
-if(fRunNumber==101){
+if(fInternalRunNumber==101){
   v2c=-0.049409 + (0.0073433)*c + (-0.000376933)*c*c + (7.39945e-06)*c*c*c + (-4.967e-08)*c*c*c*c ;
   v2s=0.00564511 + (-0.00101958)*c + (0.000121077)*c*c + (-3.44889e-06)*c*c*c + (2.42733e-08)*c*c*c*c ;
 }
-if(fRunNumber==102){
+if(fInternalRunNumber==102){
   v2c=-0.0393185 + (0.00610331)*c + (-0.000286099)*c*c + (4.61693e-06)*c*c*c + (-2.44104e-08)*c*c*c*c ;
   v2s=-0.00898987 + (0.00463766)*c + (-0.000269122)*c*c + (5.46456e-06)*c*c*c + (-3.85677e-08)*c*c*c*c ;
 }
-if(fRunNumber==103){
+if(fInternalRunNumber==103){
   v2c=-0.0171815 + (0.00271616)*c + (-9.49063e-05)*c*c + (5.68888e-07)*c*c*c + (2.77777e-09)*c*c*c*c ;
   v2s=-0.0348362 + (0.00661647)*c + (-0.000196625)*c*c + (1.60914e-06)*c*c*c + (-4.34769e-09)*c*c*c*c ;
 }
-if(fRunNumber==104){
+if(fInternalRunNumber==104){
   v2c=0.0453893 + (-0.00220981)*c + (-6.34642e-05)*c*c + (2.5268e-06)*c*c*c + (-1.81319e-08)*c*c*c*c ;
   v2s=0.0131555 + (0.00115036)*c + (-5.70975e-05)*c*c + (5.20224e-07)*c*c*c + (-3.11332e-09)*c*c*c*c ;
 }
-if(fRunNumber==105){
+if(fInternalRunNumber==105){
   v2c=0.0052505 + (0.000251094)*c + (-3.95143e-05)*c*c + (5.6354e-07)*c*c*c + (-1.86603e-09)*c*c*c*c ;
   v2s=0.079882 + (-0.00841369)*c + (0.000342924)*c*c + (-5.64554e-06)*c*c*c + (2.89511e-08)*c*c*c*c ;
 }
-if(fRunNumber==106){
+if(fInternalRunNumber==106){
   v2c=0.0561693 + (-0.00693389)*c + (0.000243013)*c*c + (-3.7816e-06)*c*c*c + (2.21666e-08)*c*c*c*c ;
   v2s=0.115847 + (-0.0145063)*c + (0.000597908)*c*c + (-9.37418e-06)*c*c*c + (4.57406e-08)*c*c*c*c ;
 }
-if(fRunNumber==107){
+if(fInternalRunNumber==107){
   v2c=-0.160892 + (0.0259075)*c + (-0.00120084)*c*c + (1.99814e-05)*c*c*c + (-1.09708e-07)*c*c*c*c ;
   v2s=0.0922001 + (-0.00861465)*c + (0.000196846)*c*c + (-5.34939e-07)*c*c*c + (-1.20442e-08)*c*c*c*c ;
 }
-if(fRunNumber==108){
+if(fInternalRunNumber==108){
   v2c=0.0325605 + (-0.00795036)*c + (0.000436987)*c*c + (-9.37794e-06)*c*c*c + (6.59912e-08)*c*c*c*c ;
   v2s=0.0894763 + (-0.00694006)*c + (0.000214928)*c*c + (-3.05745e-06)*c*c*c + (1.33679e-08)*c*c*c*c ;
 }
-if(fRunNumber==109){
+if(fInternalRunNumber==109){
   v2c=-8.30505e-05 + (0.00304264)*c + (-0.000228365)*c*c + (4.43511e-06)*c*c*c + (-2.5788e-08)*c*c*c*c ;
   v2s=0.0276356 + (-0.000486726)*c + (-1.12152e-05)*c*c + (1.56258e-07)*c*c*c + (-2.17826e-09)*c*c*c*c ;
 }
-if(fRunNumber==112){
+if(fInternalRunNumber==112){
   v2c=0.0273919 + (-0.00243837)*c + (2.41667e-05)*c*c + (3.06367e-07)*c*c*c + (-3.9028e-09)*c*c*c*c ;
   v2s=0.0119428 + (0.00161447)*c + (-0.00010526)*c*c + (1.76239e-06)*c*c*c + (-1.12844e-08)*c*c*c*c ;
 }
-if(fRunNumber==114){
+if(fInternalRunNumber==114){
   v2c=0.114287 + (-0.016125)*c + (0.000673002)*c*c + (-1.11635e-05)*c*c*c + (6.39533e-08)*c*c*c*c ;
   v2s=0.0353709 + (-0.00169691)*c + (-3.93183e-05)*c*c + (2.08815e-06)*c*c*c + (-2.03159e-08)*c*c*c*c ;
 }
-if(fRunNumber==115){
+if(fInternalRunNumber==115){
   v2c=-0.0109276 + (0.00378322)*c + (-0.000252651)*c*c + (4.599e-06)*c*c*c + (-2.36568e-08)*c*c*c*c ;
   v2s=0.0185448 + (0.00102852)*c + (-6.04966e-05)*c*c + (5.89933e-07)*c*c*c + (-2.5921e-09)*c*c*c*c ;
 }
-if(fRunNumber==116){
+if(fInternalRunNumber==116){
   v2c=-0.117563 + (0.00405449)*c + (-0.000112806)*c*c + (4.01903e-06)*c*c*c + (-4.25358e-08)*c*c*c*c ;
   v2s=0.0280797 + (-0.00528592)*c + (0.000375784)*c*c + (-9.96825e-06)*c*c*c + (7.72147e-08)*c*c*c*c ;
 }
-if(fRunNumber==117){
+if(fInternalRunNumber==117){
   v2c=0.0301869 + (-0.000751512)*c + (-9.43748e-05)*c*c + (2.60697e-06)*c*c*c + (-1.73948e-08)*c*c*c*c ;
   v2s=0.0594442 + (-0.00499442)*c + (0.000170617)*c*c + (-2.80903e-06)*c*c*c + (1.51075e-08)*c*c*c*c ;
 }
-if(fRunNumber==118){
+if(fInternalRunNumber==118){
   v2c=0.0118942 + (-0.000669595)*c + (-3.6634e-05)*c*c + (1.40794e-06)*c*c*c + (-1.15253e-08)*c*c*c*c ;
   v2s=-0.0174395 + (0.00460355)*c + (-0.00023192)*c*c + (3.83941e-06)*c*c*c + (-2.30761e-08)*c*c*c*c ;
 }
-if(fRunNumber==119){
+if(fInternalRunNumber==119){
   v2c=0.018229 + (-0.00144698)*c + (-1.07295e-06)*c*c + (6.22528e-07)*c*c*c + (-4.90504e-09)*c*c*c*c ;
   v2s=0.0122761 + (0.000985351)*c + (-6.02936e-05)*c*c + (9.41867e-07)*c*c*c + (-6.59756e-09)*c*c*c*c ;
 }
-if(fRunNumber==120){
+if(fInternalRunNumber==120){
   v2c=-0.0968065 + (0.0131861)*c + (-0.000585224)*c*c + (9.82175e-06)*c*c*c + (-5.51313e-08)*c*c*c*c ;
   v2s=0.0719334 + (-0.00752912)*c + (0.000362464)*c*c + (-6.65114e-06)*c*c*c + (3.70295e-08)*c*c*c*c ;
 }
-if(fRunNumber==121){
+if(fInternalRunNumber==121){
   v2c=0.0296329 + (-0.00448004)*c + (0.00010239)*c*c + (-2.40647e-07)*c*c*c + (-5.4555e-09)*c*c*c*c ;
   v2s=0.0774925 + (-0.00635491)*c + (0.0001939)*c*c + (-3.04755e-06)*c*c*c + (1.66055e-08)*c*c*c*c ;
 }
-if(fRunNumber==122){
+if(fInternalRunNumber==122){
   v2c=0.00956939 + (0.000460793)*c + (-0.000105912)*c*c + (2.38286e-06)*c*c*c + (-1.446e-08)*c*c*c*c ;
   v2s=0.0152677 + (0.00345263)*c + (-0.000262399)*c*c + (5.5895e-06)*c*c*c + (-3.84974e-08)*c*c*c*c ;
 }
-if(fRunNumber==123){
+if(fInternalRunNumber==123){
   v2c=0.0495618 + (-0.00059293)*c + (-0.00025227)*c*c + (6.61088e-06)*c*c*c + (-4.24063e-08)*c*c*c*c ;
   v2s=0.0862227 + (-0.0190161)*c + (0.0010647)*c*c + (-1.94957e-05)*c*c*c + (1.08665e-07)*c*c*c*c ;
 }
-if(fRunNumber==124){
+if(fInternalRunNumber==124){
   v2c=-0.0408078 + (0.00565108)*c + (-0.00027528)*c*c + (5.2165e-06)*c*c*c + (-3.3244e-08)*c*c*c*c ;
   v2s=0.00169862 + (0.00371982)*c + (-0.000169757)*c*c + (2.07347e-06)*c*c*c + (-8.30142e-09)*c*c*c*c ;
 }
-if(fRunNumber==125){
+if(fInternalRunNumber==125){
   v2c=0.0285065 + (-0.00348583)*c + (0.000106189)*c*c + (-1.56726e-06)*c*c*c + (9.40552e-09)*c*c*c*c ;
   v2s=0.0363645 + (-0.00252206)*c + (0.000122553)*c*c + (-2.74066e-06)*c*c*c + (1.66856e-08)*c*c*c*c ;
 }
-if(fRunNumber==126){
+if(fInternalRunNumber==126){
   v2c=-0.00864424 + (0.00157555)*c + (-0.000127367)*c*c + (2.47447e-06)*c*c*c + (-1.42302e-08)*c*c*c*c ;
   v2s=-0.213003 + (0.00643156)*c + (-0.000121219)*c*c + (6.06838e-07)*c*c*c + (1.48381e-09)*c*c*c*c ;
 }
-if(fRunNumber==127){
+if(fInternalRunNumber==127){
   v2c=-0.0336884 + (0.00299236)*c + (-0.000147557)*c*c + (2.47908e-06)*c*c*c + (-1.33495e-08)*c*c*c*c ;
   v2s=-0.271925 + (0.0158755)*c + (-0.000583802)*c*c + (9.14376e-06)*c*c*c + (-5.05302e-08)*c*c*c*c ;
 }
-if(fRunNumber==128){
+if(fInternalRunNumber==128){
   v2c=-0.0639711 + (0.00822881)*c + (-0.000428416)*c*c + (7.98075e-06)*c*c*c + (-4.81995e-08)*c*c*c*c ;
   v2s=-0.22634 + (0.00908632)*c + (-0.00029)*c*c + (4.14095e-06)*c*c*c + (-2.15823e-08)*c*c*c*c ;
 }
-if(fRunNumber==129){
+if(fInternalRunNumber==129){
   v2c=0.0652753 + (-0.00529737)*c + (0.000133883)*c*c + (-1.63339e-06)*c*c*c + (7.88294e-09)*c*c*c*c ;
   v2s=0.00357003 + (0.00503303)*c + (-0.000316531)*c*c + (6.45793e-06)*c*c*c + (-4.44467e-08)*c*c*c*c ;
 }
-if(fRunNumber==131){
+if(fInternalRunNumber==131){
   v2c=0.117255 + (-0.0149009)*c + (0.000560178)*c*c + (-8.75754e-06)*c*c*c + (4.85024e-08)*c*c*c*c ;
   v2s=-0.00180786 + (0.00224258)*c + (-9.84056e-05)*c*c + (1.39525e-06)*c*c*c + (-7.63512e-09)*c*c*c*c ;
 }
-if(fRunNumber==132){
+if(fInternalRunNumber==132){
   v2c=0.0100287 + (-0.00051338)*c + (-2.7702e-05)*c*c + (5.0205e-07)*c*c*c + (-1.12682e-09)*c*c*c*c ;
   v2s=0.00556895 + (0.00211082)*c + (-0.000125448)*c*c + (2.30409e-06)*c*c*c + (-1.63703e-08)*c*c*c*c ;
 }
-if(fRunNumber==133){
+if(fInternalRunNumber==133){
   v2c=-0.00755913 + (0.00327793)*c + (-0.00024545)*c*c + (5.03417e-06)*c*c*c + (-3.11617e-08)*c*c*c*c ;
   v2s=0.0398477 + (-0.000728372)*c + (-2.63935e-05)*c*c + (7.85276e-07)*c*c*c + (-7.72703e-09)*c*c*c*c ;
 }
-if(fRunNumber==134){
+if(fInternalRunNumber==134){
   v2c=0.00344056 + (0.000171769)*c + (-8.00887e-05)*c*c + (1.76696e-06)*c*c*c + (-1.08652e-08)*c*c*c*c ;
   v2s=-0.200474 + (0.00736532)*c + (-0.000221809)*c*c + (2.91763e-06)*c*c*c + (-1.40827e-08)*c*c*c*c ;
 }
-if(fRunNumber==135){
+if(fInternalRunNumber==135){
   v2c=-0.0251554 + (0.00227996)*c + (-0.000133757)*c*c + (2.50604e-06)*c*c*c + (-1.48528e-08)*c*c*c*c ;
   v2s=-0.229223 + (0.0091122)*c + (-0.000245035)*c*c + (2.64826e-06)*c*c*c + (-9.57268e-09)*c*c*c*c ;
 }
-if(fRunNumber==136){
+if(fInternalRunNumber==136){
   v2c=-0.0308547 + (0.00209237)*c + (-0.000183034)*c*c + (4.54164e-06)*c*c*c + (-3.26557e-08)*c*c*c*c ;
   v2s=-0.241702 + (0.00988355)*c + (-0.000263014)*c*c + (2.73376e-06)*c*c*c + (-9.79971e-09)*c*c*c*c ;
 }
 
-  
-  
-  
-  
-/*  
-  
+
+
+
+
+/*
+
   if(fRunNumber>=1 && fRunNumber<=45){ // 137161 -137848 //period 1
 //    v2c = 1.133676e-02-1.759454e-04*x-6.217033e-05*x*x+1.532507e-06*x*x*x-9.665265e-09*x*x*x*x;
 //    v2s = 2.173690e-02-8.410340e-04*x-1.391841e-05*x*x+5.003301e-07*x*x*x-4.175974e-09*x*x*x*x;
@@ -2040,507 +2363,507 @@ if(fRunNumber==136){
     v2c =-1.553536e-03+7.761106e-04*x-9.529723e-05*x*x+2.026750e-06*x*x*x-1.217009e-08*x*x*x*x ;
     v2s =-7.787317e-02+3.843455e-03*x-1.221144e-04*x*x+1.478448e-06*x*x*x-7.442702e-09*x*x*x*x ;
   }
-*/  
-  
+*/
+
   return phi+v2c*TMath::Sin(2.*phi)-v2s*TMath::Cos(2.*phi) ;
 
 }
 //____________________________________________________________________________
 Double_t  AliAnalysisTaskPi0Flow::ApplyFlatteningV0C(Double_t phi, Double_t c){
   //LHC10h
-  
+
   Double_t v2c =0.;
-  Double_t v2s =0;  
+  Double_t v2s =0;
 
-if(fRunNumber==1){
+if(fInternalRunNumber==1){
   v2c=-0.038901 + (0.00539521)*c + (-0.000213271)*c*c + (3.01147e-06)*c*c*c + (-1.35977e-08)*c*c*c*c ;
   v2s=0.0693294 + (-0.00851319)*c + (0.000337408)*c*c + (-5.33097e-06)*c*c*c + (2.90883e-08)*c*c*c*c ;
 }
-if(fRunNumber==2){
+if(fInternalRunNumber==2){
   v2c=-0.0943695 + (0.0137829)*c + (-0.000569334)*c*c + (8.95522e-06)*c*c*c + (-4.78396e-08)*c*c*c*c ;
   v2s=0.00971525 + (-0.00181026)*c + (6.15798e-05)*c*c + (-8.51046e-07)*c*c*c + (4.57403e-09)*c*c*c*c ;
 }
-if(fRunNumber==4){
+if(fInternalRunNumber==4){
   v2c=-0.00585475 + (0.000307793)*c + (1.89109e-06)*c*c + (-3.14804e-07)*c*c*c + (3.54341e-09)*c*c*c*c ;
   v2s=0.00374568 + (-0.00123435)*c + (8.01941e-05)*c*c + (-1.70807e-06)*c*c*c + (1.14576e-08)*c*c*c*c ;
 }
-if(fRunNumber==5){
+if(fInternalRunNumber==5){
   v2c=-0.0301267 + (0.00206698)*c + (-4.82282e-05)*c*c + (4.39355e-07)*c*c*c + (-1.3747e-09)*c*c*c*c ;
   v2s=-0.0441947 + (0.00501774)*c + (-0.000181736)*c*c + (2.69235e-06)*c*c*c + (-1.37411e-08)*c*c*c*c ;
 }
-if(fRunNumber==6){
+if(fInternalRunNumber==6){
   v2c=0.190652 + (-0.0254912)*c + (0.00105707)*c*c + (-1.63872e-05)*c*c*c + (8.51113e-08)*c*c*c*c ;
   v2s=0.0803124 + (-0.0119724)*c + (0.000575997)*c*c + (-1.07892e-05)*c*c*c + (6.67214e-08)*c*c*c*c ;
 }
-if(fRunNumber==7){
+if(fInternalRunNumber==7){
   v2c=0.00875044 + (-0.00343147)*c + (0.0002198)*c*c + (-4.76292e-06)*c*c*c + (3.24844e-08)*c*c*c*c ;
   v2s=-0.081288 + (0.0146429)*c + (-0.000728327)*c*c + (1.32462e-05)*c*c*c + (-7.95362e-08)*c*c*c*c ;
 }
-if(fRunNumber==8){
+if(fInternalRunNumber==8){
   v2c=0.0381367 + (-0.0082048)*c + (0.000410914)*c*c + (-7.28851e-06)*c*c*c + (4.22008e-08)*c*c*c*c ;
   v2s=-0.023338 + (0.003381)*c + (-0.000167791)*c*c + (3.13998e-06)*c*c*c + (-1.97233e-08)*c*c*c*c ;
 }
-if(fRunNumber==9){
+if(fInternalRunNumber==9){
   v2c=-0.00734261 + (0.00121272)*c + (-5.31181e-05)*c*c + (7.88974e-07)*c*c*c + (-3.86356e-09)*c*c*c*c ;
   v2s=-0.0228333 + (0.00266052)*c + (-0.000112824)*c*c + (1.89515e-06)*c*c*c + (-1.07446e-08)*c*c*c*c ;
 }
-if(fRunNumber==10){
+if(fInternalRunNumber==10){
   v2c=-0.0456385 + (0.0102956)*c + (-0.000529689)*c*c + (9.62809e-06)*c*c*c + (-5.7301e-08)*c*c*c*c ;
   v2s=0.0142197 + (-0.0031677)*c + (0.000190389)*c*c + (-4.10911e-06)*c*c*c + (2.81791e-08)*c*c*c*c ;
 }
-if(fRunNumber==11){
+if(fInternalRunNumber==11){
   v2c=-0.00999249 + (0.00123939)*c + (-4.23895e-05)*c*c + (6.55415e-07)*c*c*c + (-3.98256e-09)*c*c*c*c ;
   v2s=-0.00809817 + (0.00199727)*c + (-0.000116718)*c*c + (2.33449e-06)*c*c*c + (-1.46407e-08)*c*c*c*c ;
 }
-if(fRunNumber==12){
+if(fInternalRunNumber==12){
   v2c=0.0183566 + (-0.0020805)*c + (6.79726e-05)*c*c + (-7.96708e-07)*c*c*c + (3.1214e-09)*c*c*c*c ;
   v2s=-0.00714715 + (0.000721418)*c + (-3.50355e-05)*c*c + (9.09996e-07)*c*c*c + (-7.92198e-09)*c*c*c*c ;
 }
-if(fRunNumber==13){
+if(fInternalRunNumber==13){
   v2c=0.0056915 + (0.000167211)*c + (-4.68018e-05)*c*c + (1.21891e-06)*c*c*c + (-8.70124e-09)*c*c*c*c ;
   v2s=0.00986223 + (-0.00247957)*c + (0.000133539)*c*c + (-2.51362e-06)*c*c*c + (1.5397e-08)*c*c*c*c ;
 }
-if(fRunNumber==14){
+if(fInternalRunNumber==14){
   v2c=0.0479623 + (-0.00948196)*c + (0.000551795)*c*c + (-1.05692e-05)*c*c*c + (6.38754e-08)*c*c*c*c ;
   v2s=-0.00438456 + (-0.00152976)*c + (2.00645e-05)*c*c + (9.91017e-07)*c*c*c + (-1.35776e-08)*c*c*c*c ;
 }
-if(fRunNumber==15){
+if(fInternalRunNumber==15){
   v2c=-0.00384088 + (0.00121719)*c + (-6.88665e-05)*c*c + (1.26138e-06)*c*c*c + (-7.13987e-09)*c*c*c*c ;
   v2s=0.0273017 + (-0.00314818)*c + (7.85031e-05)*c*c + (-9.07336e-08)*c*c*c + (-6.42421e-09)*c*c*c*c ;
 }
-if(fRunNumber==16){
+if(fInternalRunNumber==16){
   v2c=-0.0313175 + (0.00368025)*c + (-0.000126895)*c*c + (1.7443e-06)*c*c*c + (-9.12442e-09)*c*c*c*c ;
   v2s=-0.0812178 + (0.0117402)*c + (-0.000506287)*c*c + (8.36766e-06)*c*c*c + (-4.69866e-08)*c*c*c*c ;
 }
-if(fRunNumber==17){
+if(fInternalRunNumber==17){
   v2c=0.062893 + (-0.0128204)*c + (0.000591931)*c*c + (-1.00835e-05)*c*c*c + (5.72782e-08)*c*c*c*c ;
   v2s=-0.143105 + (0.0183921)*c + (-0.000787289)*c*c + (1.33237e-05)*c*c*c + (-7.71707e-08)*c*c*c*c ;
 }
-if(fRunNumber==18){
+if(fInternalRunNumber==18){
   v2c=-0.0029353 + (-0.0016097)*c + (0.000199618)*c*c + (-5.42008e-06)*c*c*c + (4.08897e-08)*c*c*c*c ;
   v2s=0.0482015 + (-0.00115233)*c + (3.96019e-05)*c*c + (-7.7193e-07)*c*c*c + (3.90004e-09)*c*c*c*c ;
 }
-if(fRunNumber==19){
+if(fInternalRunNumber==19){
   v2c=-0.0397728 + (0.0129154)*c + (-0.000703903)*c*c + (1.30972e-05)*c*c*c + (-7.93547e-08)*c*c*c*c ;
   v2s=0.181945 + (-0.0289807)*c + (0.00133685)*c*c + (-2.30866e-05)*c*c*c + (1.32746e-07)*c*c*c*c ;
 }
-if(fRunNumber==20){
+if(fInternalRunNumber==20){
   v2c=-0.00927858 + (0.0021033)*c + (-0.000113971)*c*c + (2.17508e-06)*c*c*c + (-1.36812e-08)*c*c*c*c ;
   v2s=0.0201645 + (-0.00331311)*c + (0.000164916)*c*c + (-3.08376e-06)*c*c*c + (1.92565e-08)*c*c*c*c ;
 }
-if(fRunNumber==21){
+if(fInternalRunNumber==21){
   v2c=-0.0254895 + (0.00388685)*c + (-0.000171429)*c*c + (2.87209e-06)*c*c*c + (-1.60625e-08)*c*c*c*c ;
   v2s=0.00237609 + (0.000664255)*c + (-4.93436e-05)*c*c + (8.86415e-07)*c*c*c + (-4.51913e-09)*c*c*c*c ;
 }
-if(fRunNumber==22){
+if(fInternalRunNumber==22){
   v2c=0.0308671 + (-0.00365824)*c + (0.000148483)*c*c + (-2.52946e-06)*c*c*c + (1.49859e-08)*c*c*c*c ;
   v2s=-0.00805023 + (0.00154452)*c + (-6.89678e-05)*c*c + (1.14317e-06)*c*c*c + (-5.98991e-09)*c*c*c*c ;
 }
-if(fRunNumber==23){
+if(fInternalRunNumber==23){
   v2c=0.122018 + (-0.0233973)*c + (0.00116385)*c*c + (-2.11232e-05)*c*c*c + (1.25836e-07)*c*c*c*c ;
   v2s=-0.0511879 + (0.00708815)*c + (-0.000227282)*c*c + (2.27542e-06)*c*c*c + (-4.83128e-09)*c*c*c*c ;
 }
-if(fRunNumber==24){
+if(fInternalRunNumber==24){
   v2c=0.00888562 + (-0.000839847)*c + (2.52839e-05)*c*c + (-2.28921e-07)*c*c*c + (1.01057e-11)*c*c*c*c ;
   v2s=0.00814357 + (-0.000788997)*c + (2.43948e-05)*c*c + (-2.99558e-07)*c*c*c + (1.21675e-09)*c*c*c*c ;
 }
-if(fRunNumber==25){
+if(fInternalRunNumber==25){
   v2c=0.00360833 + (0.000379977)*c + (-3.68193e-05)*c*c + (5.86861e-07)*c*c*c + (-2.01826e-09)*c*c*c*c ;
   v2s=-0.00642047 + (0.00060076)*c + (-2.42907e-05)*c*c + (4.12933e-07)*c*c*c + (-2.3557e-09)*c*c*c*c ;
 }
-if(fRunNumber==26){
+if(fInternalRunNumber==26){
   v2c=-0.0131971 + (0.00189761)*c + (-7.7551e-05)*c*c + (1.25884e-06)*c*c*c + (-7.38989e-09)*c*c*c*c ;
   v2s=0.00679891 + (-0.000614692)*c + (1.04559e-06)*c*c + (4.34463e-07)*c*c*c + (-4.75821e-09)*c*c*c*c ;
 }
-if(fRunNumber==27){
+if(fInternalRunNumber==27){
   v2c=-0.00887089 + (0.00126865)*c + (-7.15766e-05)*c*c + (1.43811e-06)*c*c*c + (-9.408e-09)*c*c*c*c ;
   v2s=-0.0302105 + (0.00349565)*c + (-0.000126108)*c*c + (1.835e-06)*c*c*c + (-9.27845e-09)*c*c*c*c ;
 }
-if(fRunNumber==28){
+if(fInternalRunNumber==28){
   v2c=-0.0187616 + (0.0021974)*c + (-5.11412e-05)*c*c + (2.94628e-07)*c*c*c + (7.4194e-10)*c*c*c*c ;
   v2s=-0.0119204 + (-0.00156879)*c + (0.000132746)*c*c + (-2.67371e-06)*c*c*c + (1.61097e-08)*c*c*c*c ;
 }
-if(fRunNumber==29){
+if(fInternalRunNumber==29){
   v2c=-0.121018 + (0.0228924)*c + (-0.00127093)*c*c + (2.48724e-05)*c*c*c + (-1.56121e-07)*c*c*c*c ;
   v2s=-0.0687197 + (0.015702)*c + (-0.000764074)*c*c + (1.38991e-05)*c*c*c + (-8.48812e-08)*c*c*c*c ;
 }
-if(fRunNumber==30){
+if(fInternalRunNumber==30){
   v2c=0.01582 + (-0.0012293)*c + (1.62768e-05)*c*c + (2.36172e-07)*c*c*c + (-3.67153e-09)*c*c*c*c ;
   v2s=-0.00875651 + (0.00135376)*c + (-5.16763e-05)*c*c + (6.17614e-07)*c*c*c + (-1.64099e-09)*c*c*c*c ;
 }
-if(fRunNumber==31){
+if(fInternalRunNumber==31){
   v2c=-0.044721 + (0.00756113)*c + (-0.000365759)*c*c + (6.15804e-06)*c*c*c + (-3.40075e-08)*c*c*c*c ;
   v2s=-0.0500828 + (-0.000695112)*c + (0.000130909)*c*c + (-3.38476e-06)*c*c*c + (2.41179e-08)*c*c*c*c ;
 }
-if(fRunNumber==32){
+if(fInternalRunNumber==32){
   v2c=0.0306236 + (-0.00443307)*c + (0.000196517)*c*c + (-3.48059e-06)*c*c*c + (2.10266e-08)*c*c*c*c ;
   v2s=0.00819214 + (-0.000560558)*c + (-5.03783e-06)*c*c + (4.37862e-07)*c*c*c + (-3.93834e-09)*c*c*c*c ;
 }
-if(fRunNumber==33){
+if(fInternalRunNumber==33){
   v2c=0.0120077 + (-0.00139976)*c + (5.85677e-05)*c*c + (-9.06209e-07)*c*c*c + (4.61403e-09)*c*c*c*c ;
   v2s=-0.0197677 + (0.00253589)*c + (-0.000101374)*c*c + (1.59347e-06)*c*c*c + (-8.65961e-09)*c*c*c*c ;
 }
-if(fRunNumber==34){
+if(fInternalRunNumber==34){
   v2c=0.0759546 + (-0.0131538)*c + (0.000577001)*c*c + (-9.39636e-06)*c*c*c + (5.16814e-08)*c*c*c*c ;
   v2s=-0.0727864 + (0.00956655)*c + (-0.000406191)*c*c + (7.50453e-06)*c*c*c + (-4.93819e-08)*c*c*c*c ;
 }
-if(fRunNumber==35){
+if(fInternalRunNumber==35){
   v2c=-0.00622564 + (0.00107647)*c + (-6.25644e-05)*c*c + (1.28553e-06)*c*c*c + (-8.46286e-09)*c*c*c*c ;
   v2s=0.0051704 + (-0.00165348)*c + (8.69531e-05)*c*c + (-1.69895e-06)*c*c*c + (1.09762e-08)*c*c*c*c ;
 }
-if(fRunNumber==36){
+if(fInternalRunNumber==36){
   v2c=0.0117872 + (-0.000807391)*c + (-1.70999e-05)*c*c + (1.19089e-06)*c*c*c + (-1.13278e-08)*c*c*c*c ;
   v2s=-0.000162495 + (1.04465e-05)*c + (-1.07156e-05)*c*c + (2.54308e-07)*c*c*c + (-7.04948e-10)*c*c*c*c ;
 }
-if(fRunNumber==37){
+if(fInternalRunNumber==37){
   v2c=-0.0119236 + (0.00290105)*c + (-0.000162086)*c*c + (3.22645e-06)*c*c*c + (-2.07075e-08)*c*c*c*c ;
   v2s=-0.0178535 + (0.00283024)*c + (-0.00012812)*c*c + (2.02404e-06)*c*c*c + (-1.0248e-08)*c*c*c*c ;
 }
-if(fRunNumber==38){
+if(fInternalRunNumber==38){
   v2c=0.023002 + (-0.00433112)*c + (0.000229879)*c*c + (-4.52792e-06)*c*c*c + (2.92715e-08)*c*c*c*c ;
   v2s=-0.0217933 + (0.00235291)*c + (-0.000108054)*c*c + (2.08937e-06)*c*c*c + (-1.3524e-08)*c*c*c*c ;
 }
-if(fRunNumber==39){
+if(fInternalRunNumber==39){
   v2c=0.00795585 + (-0.000372683)*c + (1.85243e-05)*c*c + (-4.28133e-07)*c*c*c + (3.02452e-09)*c*c*c*c ;
   v2s=-0.0849826 + (0.00529466)*c + (-0.000163148)*c*c + (2.1186e-06)*c*c*c + (-9.48208e-09)*c*c*c*c ;
 }
-if(fRunNumber==40){
+if(fInternalRunNumber==40){
   v2c=0.00653019 + (-0.00127651)*c + (7.59264e-05)*c*c + (-1.6363e-06)*c*c*c + (1.11375e-08)*c*c*c*c ;
   v2s=-0.0107686 + (0.000982587)*c + (-2.97061e-05)*c*c + (4.04795e-07)*c*c*c + (-1.91289e-09)*c*c*c*c ;
 }
-if(fRunNumber==41){
+if(fInternalRunNumber==41){
   v2c=0.012007 + (-0.00102703)*c + (3.48714e-05)*c*c + (-5.13011e-07)*c*c*c + (2.57827e-09)*c*c*c*c ;
   v2s=-0.00713083 + (0.00101952)*c + (-4.7675e-05)*c*c + (9.12723e-07)*c*c*c + (-5.99694e-09)*c*c*c*c ;
 }
-if(fRunNumber==42){
+if(fInternalRunNumber==42){
   v2c=-0.0486696 + (0.00723345)*c + (-0.000324232)*c*c + (5.25317e-06)*c*c*c + (-2.78981e-08)*c*c*c*c ;
   v2s=-0.0485877 + (-0.00064506)*c + (9.15858e-05)*c*c + (-1.97486e-06)*c*c*c + (1.28831e-08)*c*c*c*c ;
 }
-if(fRunNumber==43){
+if(fInternalRunNumber==43){
   v2c=0.0003541 + (-0.000236832)*c + (1.82448e-05)*c*c + (-4.20764e-07)*c*c*c + (2.96882e-09)*c*c*c*c ;
   v2s=0.00107616 + (-0.000462058)*c + (2.46761e-05)*c*c + (-4.33199e-07)*c*c*c + (2.47324e-09)*c*c*c*c ;
 }
-if(fRunNumber==44){
+if(fInternalRunNumber==44){
   v2c=-0.0778259 + (0.0128797)*c + (-0.000514371)*c*c + (7.70095e-06)*c*c*c + (-3.89026e-08)*c*c*c*c ;
   v2s=-0.106839 + (0.00670369)*c + (-0.000184721)*c*c + (1.64581e-06)*c*c*c + (-1.47049e-09)*c*c*c*c ;
 }
-if(fRunNumber==45){
+if(fInternalRunNumber==45){
   v2c=0.0513049 + (-0.00715356)*c + (0.000289106)*c*c + (-4.46938e-06)*c*c*c + (2.36599e-08)*c*c*c*c ;
   v2s=-0.0252464 + (0.00170124)*c + (-3.04376e-05)*c*c + (9.4935e-08)*c*c*c + (9.41807e-10)*c*c*c*c ;
 }
-if(fRunNumber==46){
+if(fInternalRunNumber==46){
   v2c=0.0317697 + (-0.00121243)*c + (5.94543e-05)*c*c + (-1.26341e-06)*c*c*c + (8.49329e-09)*c*c*c*c ;
   v2s=-0.092276 + (0.00299941)*c + (-5.24713e-05)*c*c + (3.07331e-07)*c*c*c + (7.44139e-10)*c*c*c*c ;
 }
-if(fRunNumber==47){
+if(fInternalRunNumber==47){
   v2c=0.0429796 + (-0.000861588)*c + (6.82123e-07)*c*c + (1.96388e-07)*c*c*c + (-1.56984e-09)*c*c*c*c ;
   v2s=-0.133047 + (0.00853153)*c + (-0.000287983)*c*c + (4.1155e-06)*c*c*c + (-2.00239e-08)*c*c*c*c ;
 }
-if(fRunNumber==48){
+if(fInternalRunNumber==48){
   v2c=0.0480979 + (-0.000354969)*c + (-6.45176e-05)*c*c + (2.34807e-06)*c*c*c + (-1.9069e-08)*c*c*c*c ;
   v2s=-0.138315 + (0.0126874)*c + (-0.000672052)*c*c + (1.34449e-05)*c*c*c + (-8.64756e-08)*c*c*c*c ;
 }
-if(fRunNumber==51){
+if(fInternalRunNumber==51){
   v2c=-0.0114422 + (0.00506157)*c + (-0.000227041)*c*c + (3.97457e-06)*c*c*c + (-2.35322e-08)*c*c*c*c ;
   v2s=-0.208135 + (0.0160488)*c + (-0.000536132)*c*c + (7.2714e-06)*c*c*c + (-3.28328e-08)*c*c*c*c ;
 }
-if(fRunNumber==52){
+if(fInternalRunNumber==52){
   v2c=0.00113321 + (0.000922798)*c + (-6.5971e-05)*c*c + (1.40416e-06)*c*c*c + (-9.29905e-09)*c*c*c*c ;
   v2s=0.0550392 + (-0.00725661)*c + (0.000298984)*c*c + (-4.85473e-06)*c*c*c + (2.72063e-08)*c*c*c*c ;
 }
-if(fRunNumber==53){
+if(fInternalRunNumber==53){
   v2c=-0.003508 + (6.54451e-06)*c + (1.28603e-05)*c*c + (-3.83674e-07)*c*c*c + (3.1053e-09)*c*c*c*c ;
   v2s=0.00714978 + (-0.00198147)*c + (0.000113909)*c*c + (-2.1949e-06)*c*c*c + (1.34933e-08)*c*c*c*c ;
 }
-if(fRunNumber==54){
+if(fInternalRunNumber==54){
   v2c=-0.0024598 + (5.87979e-05)*c + (9.36516e-06)*c*c + (-2.66045e-07)*c*c*c + (1.80016e-09)*c*c*c*c ;
   v2s=-0.00651135 + (0.00109883)*c + (-4.41501e-05)*c*c + (6.19398e-07)*c*c*c + (-2.61977e-09)*c*c*c*c ;
 }
-if(fRunNumber==55){
+if(fInternalRunNumber==55){
   v2c=0.0472936 + (-0.00156718)*c + (3.03713e-05)*c*c + (-1.97139e-07)*c*c*c + (-3.55205e-10)*c*c*c*c ;
   v2s=-0.155014 + (0.00717506)*c + (-0.000168137)*c*c + (1.55419e-06)*c*c*c + (-3.64579e-09)*c*c*c*c ;
 }
-if(fRunNumber==56){
+if(fInternalRunNumber==56){
   v2c=0.011328 + (0.000924574)*c + (-6.803e-05)*c*c + (9.76956e-07)*c*c*c + (-2.90494e-09)*c*c*c*c ;
   v2s=-0.0412661 + (0.0107218)*c + (-0.000533108)*c*c + (9.75563e-06)*c*c*c + (-5.95608e-08)*c*c*c*c ;
 }
-if(fRunNumber==57){
+if(fInternalRunNumber==57){
   v2c=0.00900452 + (0.000588343)*c + (-3.02208e-05)*c*c + (2.13239e-07)*c*c*c + (9.25727e-10)*c*c*c*c ;
   v2s=0.13086 + (-0.0204768)*c + (0.000928956)*c*c + (-1.63917e-05)*c*c*c + (9.8273e-08)*c*c*c*c ;
 }
-if(fRunNumber==58){
+if(fInternalRunNumber==58){
   v2c=-0.0143951 + (0.00247373)*c + (-0.000107909)*c*c + (1.69603e-06)*c*c*c + (-9.05555e-09)*c*c*c*c ;
   v2s=-0.0209397 + (0.00180446)*c + (-5.97034e-05)*c*c + (8.17388e-07)*c*c*c + (-3.77989e-09)*c*c*c*c ;
 }
-if(fRunNumber==59){
+if(fInternalRunNumber==59){
   v2c=-0.0619279 + (0.00393575)*c + (-0.00011867)*c*c + (1.45001e-06)*c*c*c + (-5.98792e-09)*c*c*c*c ;
   v2s=-0.248103 + (0.0158553)*c + (-0.000529631)*c*c + (7.46158e-06)*c*c*c + (-3.60091e-08)*c*c*c*c ;
 }
-if(fRunNumber==60){
+if(fInternalRunNumber==60){
   v2c=-0.00886115 + (0.00152741)*c + (-6.94062e-05)*c*c + (1.11727e-06)*c*c*c + (-5.81351e-09)*c*c*c*c ;
   v2s=-0.000911417 + (0.000122344)*c + (-1.24605e-06)*c*c + (-6.29249e-08)*c*c*c + (8.81971e-10)*c*c*c*c ;
 }
-if(fRunNumber==61){
+if(fInternalRunNumber==61){
   v2c=-0.00510166 + (0.00040596)*c + (-4.37341e-06)*c*c + (-1.15302e-07)*c*c*c + (1.53428e-09)*c*c*c*c ;
   v2s=-0.0170123 + (0.00220818)*c + (-9.50905e-05)*c*c + (1.59566e-06)*c*c*c + (-8.92053e-09)*c*c*c*c ;
 }
-if(fRunNumber==62){
+if(fInternalRunNumber==62){
   v2c=-0.00332885 + (-0.000430498)*c + (5.60341e-05)*c*c + (-1.47922e-06)*c*c*c + (1.09723e-08)*c*c*c*c ;
   v2s=-0.0519534 + (0.00892818)*c + (-0.000434243)*c*c + (7.8407e-06)*c*c*c + (-4.69363e-08)*c*c*c*c ;
 }
-if(fRunNumber==63){
+if(fInternalRunNumber==63){
   v2c=-0.00176529 + (0.00123097)*c + (-6.59677e-05)*c*c + (1.24591e-06)*c*c*c + (-7.90285e-09)*c*c*c*c ;
   v2s=-0.0181792 + (0.00222004)*c + (-7.96902e-05)*c*c + (1.13047e-06)*c*c*c + (-5.72272e-09)*c*c*c*c ;
 }
-if(fRunNumber==64){
+if(fInternalRunNumber==64){
   v2c=0.00546184 + (-0.000449463)*c + (1.50833e-05)*c*c + (-1.72501e-07)*c*c*c + (3.58774e-10)*c*c*c*c ;
   v2s=0.013284 + (-0.00260671)*c + (0.000134403)*c*c + (-2.461e-06)*c*c*c + (1.47694e-08)*c*c*c*c ;
 }
-if(fRunNumber==65){
+if(fInternalRunNumber==65){
   v2c=0.0108447 + (-0.0017699)*c + (4.62716e-05)*c*c + (-3.4647e-07)*c*c*c + (5.24536e-10)*c*c*c*c ;
   v2s=0.0302247 + (-0.00605136)*c + (0.000290676)*c*c + (-4.87706e-06)*c*c*c + (2.65104e-08)*c*c*c*c ;
 }
-if(fRunNumber==66){
+if(fInternalRunNumber==66){
   v2c=-0.0100092 + (0.00144457)*c + (-6.512e-05)*c*c + (1.05356e-06)*c*c*c + (-5.52231e-09)*c*c*c*c ;
   v2s=-0.00380228 + (0.000610003)*c + (-3.47943e-05)*c*c + (7.21188e-07)*c*c*c + (-4.76727e-09)*c*c*c*c ;
 }
-if(fRunNumber==67){
+if(fInternalRunNumber==67){
   v2c=-0.0229901 + (0.00400737)*c + (-0.000206024)*c*c + (3.93038e-06)*c*c*c + (-2.46388e-08)*c*c*c*c ;
   v2s=-0.00286041 + (0.000648607)*c + (-2.37397e-05)*c*c + (2.0372e-07)*c*c*c + (2.97679e-10)*c*c*c*c ;
 }
-if(fRunNumber==68){
+if(fInternalRunNumber==68){
   v2c=-0.0603647 + (0.0045685)*c + (-0.000171555)*c*c + (2.66377e-06)*c*c*c + (-1.45892e-08)*c*c*c*c ;
   v2s=-0.21447 + (0.00909524)*c + (-0.000265298)*c*c + (3.73262e-06)*c*c*c + (-1.84484e-08)*c*c*c*c ;
 }
-if(fRunNumber==69){
+if(fInternalRunNumber==69){
   v2c=-0.0207879 + (0.000139613)*c + (1.27802e-05)*c*c + (-6.40328e-07)*c*c*c + (6.35949e-09)*c*c*c*c ;
   v2s=-0.266459 + (0.0156802)*c + (-0.000481647)*c*c + (6.4597e-06)*c*c*c + (-3.047e-08)*c*c*c*c ;
 }
-if(fRunNumber==70){
+if(fInternalRunNumber==70){
   v2c=-0.0324843 + (0.00376852)*c + (-0.000136873)*c*c + (2.01389e-06)*c*c*c + (-1.03877e-08)*c*c*c*c ;
   v2s=-0.0178378 + (0.00145491)*c + (-3.55421e-05)*c*c + (2.25993e-07)*c*c*c + (7.06258e-10)*c*c*c*c ;
 }
-if(fRunNumber==71){
+if(fInternalRunNumber==71){
   v2c=-0.0138645 + (0.00167315)*c + (-6.68544e-05)*c*c + (1.07133e-06)*c*c*c + (-5.92659e-09)*c*c*c*c ;
   v2s=0.0359716 + (-0.00461076)*c + (0.000192868)*c*c + (-3.21409e-06)*c*c*c + (1.84468e-08)*c*c*c*c ;
 }
-if(fRunNumber==72){
+if(fInternalRunNumber==72){
   v2c=0.0111712 + (-0.00175546)*c + (6.87862e-05)*c*c + (-8.99029e-07)*c*c*c + (3.44492e-09)*c*c*c*c ;
   v2s=-0.00352823 + (0.000480673)*c + (-2.66091e-05)*c*c + (5.54922e-07)*c*c*c + (-3.84534e-09)*c*c*c*c ;
 }
-if(fRunNumber==73){
+if(fInternalRunNumber==73){
   v2c=-0.000939145 + (-0.000235945)*c + (2.51908e-05)*c*c + (-6.52435e-07)*c*c*c + (4.8218e-09)*c*c*c*c ;
   v2s=0.00666852 + (-0.000373105)*c + (-1.22838e-05)*c*c + (7.3621e-07)*c*c*c + (-7.2867e-09)*c*c*c*c ;
 }
-if(fRunNumber==74){
+if(fInternalRunNumber==74){
   v2c=0.0474235 + (-0.00890967)*c + (0.000427741)*c*c + (-7.38723e-06)*c*c*c + (4.17242e-08)*c*c*c*c ;
   v2s=0.0142517 + (-0.00326338)*c + (0.000142729)*c*c + (-2.27831e-06)*c*c*c + (1.14084e-08)*c*c*c*c ;
 }
-if(fRunNumber==75){
+if(fInternalRunNumber==75){
   v2c=0.0237808 + (-0.00310491)*c + (0.000134288)*c*c + (-2.27429e-06)*c*c*c + (1.32749e-08)*c*c*c*c ;
   v2s=-0.0258905 + (0.00417719)*c + (-0.000193901)*c*c + (3.41383e-06)*c*c*c + (-2.01695e-08)*c*c*c*c ;
 }
-if(fRunNumber==76){
+if(fInternalRunNumber==76){
   v2c=0.0149865 + (-0.00140739)*c + (4.24537e-05)*c*c + (-4.06273e-07)*c*c*c + (5.44496e-10)*c*c*c*c ;
   v2s=0.00820134 + (-0.000519432)*c + (6.82211e-06)*c*c + (1.06291e-07)*c*c*c + (-1.65344e-09)*c*c*c*c ;
 }
-if(fRunNumber==77){
+if(fInternalRunNumber==77){
   v2c=0.048123 + (-0.00608197)*c + (0.000246409)*c*c + (-4.05028e-06)*c*c*c + (2.33536e-08)*c*c*c*c ;
   v2s=-0.0214729 + (0.0029389)*c + (-0.000133826)*c*c + (2.29845e-06)*c*c*c + (-1.29253e-08)*c*c*c*c ;
 }
-if(fRunNumber==78){
+if(fInternalRunNumber==78){
   v2c=-0.0172924 + (0.00202216)*c + (-6.478e-05)*c*c + (8.08739e-07)*c*c*c + (-3.73211e-09)*c*c*c*c ;
   v2s=-0.0355638 + (0.00121518)*c + (3.97839e-05)*c*c + (-1.62346e-06)*c*c*c + (1.27105e-08)*c*c*c*c ;
 }
-if(fRunNumber==79){
+if(fInternalRunNumber==79){
   v2c=0.040762 + (-0.00311921)*c + (6.66868e-05)*c*c + (-1.18554e-06)*c*c*c + (1.07519e-08)*c*c*c*c ;
   v2s=-0.00558438 + (-0.00154821)*c + (0.000165732)*c*c + (-4.56377e-06)*c*c*c + (3.56988e-08)*c*c*c*c ;
 }
-if(fRunNumber==81){
+if(fInternalRunNumber==81){
   v2c=-0.0247995 + (0.00179444)*c + (-0.000102085)*c*c + (2.31093e-06)*c*c*c + (-1.61924e-08)*c*c*c*c ;
   v2s=-0.249009 + (0.0133297)*c + (-0.000415717)*c*c + (5.84494e-06)*c*c*c + (-2.88179e-08)*c*c*c*c ;
 }
-if(fRunNumber==82){
+if(fInternalRunNumber==82){
   v2c=-0.0249921 + (0.00199208)*c + (-7.86121e-05)*c*c + (1.40547e-06)*c*c*c + (-9.39651e-09)*c*c*c*c ;
   v2s=-0.254469 + (0.0150694)*c + (-0.000499848)*c*c + (7.08318e-06)*c*c*c + (-3.40806e-08)*c*c*c*c ;
 }
-if(fRunNumber==83){
+if(fInternalRunNumber==83){
   v2c=-0.0721 + (0.00951559)*c + (-0.000431762)*c*c + (8.4632e-06)*c*c*c + (-5.79485e-08)*c*c*c*c ;
   v2s=-0.00864625 + (-0.00706196)*c + (0.000313773)*c*c + (-5.10066e-06)*c*c*c + (2.9662e-08)*c*c*c*c ;
 }
-if(fRunNumber==84){
+if(fInternalRunNumber==84){
   v2c=-0.0198112 + (-0.0062788)*c + (0.000353589)*c*c + (-5.70525e-06)*c*c*c + (2.82617e-08)*c*c*c*c ;
   v2s=-0.0704647 + (0.0031015)*c + (-0.000244985)*c*c + (6.17258e-06)*c*c*c + (-4.43331e-08)*c*c*c*c ;
 }
-if(fRunNumber==85){
+if(fInternalRunNumber==85){
   v2c=-0.0161955 + (-0.0017361)*c + (0.000130612)*c*c + (-2.9548e-06)*c*c*c + (2.05684e-08)*c*c*c*c ;
   v2s=-0.204119 + (0.00714989)*c + (-0.000162549)*c*c + (1.87459e-06)*c*c*c + (-7.79143e-09)*c*c*c*c ;
 }
-if(fRunNumber==86){
+if(fInternalRunNumber==86){
   v2c=0.00995155 + (-0.00196822)*c + (0.00010617)*c*c + (-2.01071e-06)*c*c*c + (1.22728e-08)*c*c*c*c ;
   v2s=0.0148901 + (-0.002581)*c + (0.000132002)*c*c + (-2.44601e-06)*c*c*c + (1.48144e-08)*c*c*c*c ;
 }
-if(fRunNumber==87){
+if(fInternalRunNumber==87){
   v2c=-0.00411031 + (0.000510639)*c + (-2.27814e-05)*c*c + (6.41192e-07)*c*c*c + (-5.85467e-09)*c*c*c*c ;
   v2s=0.0121118 + (-0.00281)*c + (0.000143754)*c*c + (-2.62557e-06)*c*c*c + (1.61207e-08)*c*c*c*c ;
 }
-if(fRunNumber==88){
+if(fInternalRunNumber==88){
   v2c=-0.00570308 + (-0.000945116)*c + (7.42606e-05)*c*c + (-1.51212e-06)*c*c*c + (9.57993e-09)*c*c*c*c ;
   v2s=-0.0282666 + (0.00398475)*c + (-0.000165678)*c*c + (2.68542e-06)*c*c*c + (-1.4688e-08)*c*c*c*c ;
 }
-if(fRunNumber==89){
+if(fInternalRunNumber==89){
   v2c=0.0845785 + (-0.012611)*c + (0.000561197)*c*c + (-9.39333e-06)*c*c*c + (5.16139e-08)*c*c*c*c ;
   v2s=0.149689 + (-0.0193648)*c + (0.000771629)*c*c + (-1.21901e-05)*c*c*c + (6.6443e-08)*c*c*c*c ;
 }
-if(fRunNumber==91){
+if(fInternalRunNumber==91){
   v2c=-0.0289605 + (0.00127922)*c + (-4.47445e-06)*c*c + (-4.00293e-07)*c*c*c + (3.82966e-09)*c*c*c*c ;
   v2s=-0.241098 + (0.00906132)*c + (-0.000159552)*c*c + (6.47243e-07)*c*c*c + (4.61048e-09)*c*c*c*c ;
 }
-if(fRunNumber==95){
+if(fInternalRunNumber==95){
   v2c=0.0144072 + (-0.000966056)*c + (6.47254e-05)*c*c + (-1.84164e-06)*c*c*c + (1.51588e-08)*c*c*c*c ;
   v2s=-0.306678 + (0.0184746)*c + (-0.000540218)*c*c + (6.36681e-06)*c*c*c + (-2.37512e-08)*c*c*c*c ;
 }
-if(fRunNumber==96){
+if(fInternalRunNumber==96){
   v2c=0.00506182 + (-0.000632672)*c + (1.89752e-05)*c*c + (-2.14999e-07)*c*c*c + (3.12179e-10)*c*c*c*c ;
   v2s=-0.218693 + (0.00676786)*c + (-0.000115485)*c*c + (5.56737e-07)*c*c*c + (2.68891e-09)*c*c*c*c ;
 }
-if(fRunNumber==97){
+if(fInternalRunNumber==97){
   v2c=-0.0225062 + (0.00204445)*c + (-6.76028e-05)*c*c + (8.92976e-07)*c*c*c + (-4.00576e-09)*c*c*c*c ;
   v2s=-0.260286 + (0.0139325)*c + (-0.000425631)*c*c + (5.64038e-06)*c*c*c + (-2.51554e-08)*c*c*c*c ;
 }
-if(fRunNumber==98){
+if(fInternalRunNumber==98){
   v2c=-0.0261849 + (0.0063862)*c + (-0.000293076)*c*c + (4.37234e-06)*c*c*c + (-2.04899e-08)*c*c*c*c ;
   v2s=-0.17744 + (0.00236157)*c + (9.2782e-06)*c*c + (-5.63126e-07)*c*c*c + (4.9714e-09)*c*c*c*c ;
 }
-if(fRunNumber==101){
+if(fInternalRunNumber==101){
   v2c=0.101445 + (-0.015664)*c + (0.000747255)*c*c + (-1.36979e-05)*c*c*c + (8.36903e-08)*c*c*c*c ;
   v2s=0.0152975 + (-0.00329946)*c + (0.00018627)*c*c + (-3.88572e-06)*c*c*c + (2.64895e-08)*c*c*c*c ;
 }
-if(fRunNumber==102){
+if(fInternalRunNumber==102){
   v2c=-0.0344927 + (0.00470964)*c + (-0.000188941)*c*c + (3.0206e-06)*c*c*c + (-1.69735e-08)*c*c*c*c ;
   v2s=0.0142624 + (-0.00240623)*c + (9.16657e-05)*c*c + (-1.14663e-06)*c*c*c + (4.14195e-09)*c*c*c*c ;
 }
-if(fRunNumber==103){
+if(fInternalRunNumber==103){
   v2c=-0.0238316 + (0.00322675)*c + (-0.000123462)*c*c + (1.76428e-06)*c*c*c + (-8.66176e-09)*c*c*c*c ;
   v2s=0.0227184 + (-0.00299954)*c + (0.00014422)*c*c + (-2.81018e-06)*c*c*c + (1.82546e-08)*c*c*c*c ;
 }
-if(fRunNumber==104){
+if(fInternalRunNumber==104){
   v2c=0.0118014 + (-0.000998833)*c + (3.77271e-05)*c*c + (-6.19183e-07)*c*c*c + (3.49065e-09)*c*c*c*c ;
   v2s=0.000977264 + (0.00012542)*c + (1.40219e-08)*c*c + (-2.24472e-09)*c*c*c + (-3.39763e-10)*c*c*c*c ;
 }
-if(fRunNumber==105){
+if(fInternalRunNumber==105){
   v2c=0.0312332 + (-0.00348485)*c + (0.000108654)*c*c + (-1.28443e-06)*c*c*c + (4.80188e-09)*c*c*c*c ;
   v2s=-0.0344234 + (0.00443313)*c + (-0.000173309)*c*c + (2.7124e-06)*c*c*c + (-1.42518e-08)*c*c*c*c ;
 }
-if(fRunNumber==106){
+if(fInternalRunNumber==106){
   v2c=0.0369386 + (-0.00434063)*c + (0.00018894)*c*c + (-3.45688e-06)*c*c*c + (2.16617e-08)*c*c*c*c ;
   v2s=-0.00675251 + (0.000691284)*c + (-1.08033e-06)*c*c + (-5.57352e-07)*c*c*c + (6.28148e-09)*c*c*c*c ;
 }
-if(fRunNumber==107){
+if(fInternalRunNumber==107){
   v2c=-0.0441483 + (0.00803486)*c + (-0.00034871)*c*c + (4.76349e-06)*c*c*c + (-1.81393e-08)*c*c*c*c ;
   v2s=-0.141046 + (0.0165183)*c + (-0.000592546)*c*c + (8.956e-06)*c*c*c + (-4.86662e-08)*c*c*c*c ;
 }
-if(fRunNumber==108){
+if(fInternalRunNumber==108){
   v2c=-0.0531169 + (0.00637348)*c + (-0.000218334)*c*c + (2.66873e-06)*c*c*c + (-9.86859e-09)*c*c*c*c ;
   v2s=-0.00809622 + (-0.000552159)*c + (6.27984e-05)*c*c + (-1.33136e-06)*c*c*c + (7.45069e-09)*c*c*c*c ;
 }
-if(fRunNumber==109){
+if(fInternalRunNumber==109){
   v2c=-0.00189593 + (0.00153994)*c + (-9.92105e-05)*c*c + (1.98756e-06)*c*c*c + (-1.24677e-08)*c*c*c*c ;
   v2s=0.0252107 + (-0.00330651)*c + (0.000128362)*c*c + (-1.89951e-06)*c*c*c + (9.45477e-09)*c*c*c*c ;
 }
-if(fRunNumber==112){
+if(fInternalRunNumber==112){
   v2c=-0.00939028 + (0.00128226)*c + (-5.24125e-05)*c*c + (8.50382e-07)*c*c*c + (-4.65785e-09)*c*c*c*c ;
   v2s=0.00201633 + (-0.00116151)*c + (7.59727e-05)*c*c + (-1.59962e-06)*c*c*c + (1.04645e-08)*c*c*c*c ;
 }
-if(fRunNumber==114){
+if(fInternalRunNumber==114){
   v2c=-0.00783351 + (0.00122277)*c + (-3.37736e-05)*c*c + (3.12136e-07)*c*c*c + (-9.19359e-10)*c*c*c*c ;
   v2s=0.0103833 + (-0.00215968)*c + (9.96942e-05)*c*c + (-1.71974e-06)*c*c*c + (1.01511e-08)*c*c*c*c ;
 }
-if(fRunNumber==115){
+if(fInternalRunNumber==115){
   v2c=0.00588164 + (-0.00083683)*c + (5.13684e-05)*c*c + (-1.14177e-06)*c*c*c + (8.11899e-09)*c*c*c*c ;
   v2s=0.0037561 + (-0.000786163)*c + (3.88084e-05)*c*c + (-7.73678e-07)*c*c*c + (5.27396e-09)*c*c*c*c ;
 }
-if(fRunNumber==116){
+if(fInternalRunNumber==116){
   v2c=0.0610685 + (-0.00392239)*c + (6.23272e-05)*c*c + (9.84282e-07)*c*c*c + (-1.75418e-08)*c*c*c*c ;
   v2s=-0.106295 + (0.0124333)*c + (-0.000510299)*c*c + (8.51235e-06)*c*c*c + (-4.9787e-08)*c*c*c*c ;
 }
-if(fRunNumber==117){
+if(fInternalRunNumber==117){
   v2c=-0.0132264 + (0.0024143)*c + (-0.000106307)*c*c + (1.74632e-06)*c*c*c + (-9.79752e-09)*c*c*c*c ;
   v2s=-0.00788943 + (0.000443907)*c + (-1.83984e-05)*c*c + (3.81018e-07)*c*c*c + (-2.52604e-09)*c*c*c*c ;
 }
-if(fRunNumber==118){
+if(fInternalRunNumber==118){
   v2c=-0.045835 + (0.00849686)*c + (-0.000408675)*c*c + (7.3031e-06)*c*c*c + (-4.34655e-08)*c*c*c*c ;
   v2s=-0.0455199 + (0.00718851)*c + (-0.000340502)*c*c + (6.00457e-06)*c*c*c + (-3.51883e-08)*c*c*c*c ;
 }
-if(fRunNumber==119){
+if(fInternalRunNumber==119){
   v2c=-0.00627236 + (0.00146712)*c + (-9.05375e-05)*c*c + (1.96962e-06)*c*c*c + (-1.35867e-08)*c*c*c*c ;
   v2s=-0.00544096 + (0.000598445)*c + (-7.61032e-06)*c*c + (-2.09579e-07)*c*c*c + (3.00091e-09)*c*c*c*c ;
 }
-if(fRunNumber==120){
+if(fInternalRunNumber==120){
   v2c=-0.0376823 + (0.00376965)*c + (-8.01573e-05)*c*c + (-2.80792e-09)*c*c*c + (6.79508e-09)*c*c*c*c ;
   v2s=-0.0675803 + (0.00849852)*c + (-0.000298266)*c*c + (3.93178e-06)*c*c*c + (-1.68582e-08)*c*c*c*c ;
 }
-if(fRunNumber==121){
+if(fInternalRunNumber==121){
   v2c=0.0285153 + (-0.00340253)*c + (0.000130854)*c*c + (-2.02449e-06)*c*c*c + (1.09594e-08)*c*c*c*c ;
   v2s=0.0224991 + (-0.00524188)*c + (0.000269226)*c*c + (-4.93926e-06)*c*c*c + (2.97604e-08)*c*c*c*c ;
 }
-if(fRunNumber==122){
+if(fInternalRunNumber==122){
   v2c=0.00379321 + (0.000532446)*c + (-6.16649e-05)*c*c + (1.67786e-06)*c*c*c + (-1.29277e-08)*c*c*c*c ;
   v2s=-0.011158 + (0.00256124)*c + (-0.000150921)*c*c + (3.22488e-06)*c*c*c + (-2.16809e-08)*c*c*c*c ;
 }
-if(fRunNumber==123){
+if(fInternalRunNumber==123){
   v2c=-0.0607006 + (0.00831906)*c + (-0.000398705)*c*c + (6.66385e-06)*c*c*c + (-3.5222e-08)*c*c*c*c ;
   v2s=0.0389204 + (-0.00798361)*c + (0.000297135)*c*c + (-3.79751e-06)*c*c*c + (1.47914e-08)*c*c*c*c ;
 }
-if(fRunNumber==124){
+if(fInternalRunNumber==124){
   v2c=-0.0288952 + (0.00325728)*c + (-0.000104126)*c*c + (1.29062e-06)*c*c*c + (-6.03539e-09)*c*c*c*c ;
   v2s=0.0318884 + (-0.00301585)*c + (0.000131913)*c*c + (-2.5702e-06)*c*c*c + (1.71313e-08)*c*c*c*c ;
 }
-if(fRunNumber==125){
+if(fInternalRunNumber==125){
   v2c=-0.00413859 + (0.00024613)*c + (5.33902e-06)*c*c + (-3.86963e-07)*c*c*c + (3.89277e-09)*c*c*c*c ;
   v2s=-0.0492298 + (0.00624793)*c + (-0.000243844)*c*c + (3.69001e-06)*c*c*c + (-1.9156e-08)*c*c*c*c ;
 }
-if(fRunNumber==126){
+if(fInternalRunNumber==126){
   v2c=-0.018816 + (0.00134076)*c + (-4.50486e-05)*c*c + (5.84259e-07)*c*c*c + (-2.34235e-09)*c*c*c*c ;
   v2s=-0.295912 + (0.0159608)*c + (-0.000497569)*c*c + (6.92442e-06)*c*c*c + (-3.35159e-08)*c*c*c*c ;
 }
-if(fRunNumber==127){
+if(fInternalRunNumber==127){
   v2c=-0.039222 + (0.00400933)*c + (-0.0001341)*c*c + (1.65214e-06)*c*c*c + (-6.33829e-09)*c*c*c*c ;
   v2s=-0.290884 + (0.0147027)*c + (-0.000429021)*c*c + (5.64116e-06)*c*c*c + (-2.58784e-08)*c*c*c*c ;
 }
-if(fRunNumber==128){
+if(fInternalRunNumber==128){
   v2c=0.0168685 + (-0.00285775)*c + (0.000141099)*c*c + (-2.48846e-06)*c*c*c + (1.41845e-08)*c*c*c*c ;
   v2s=-0.278776 + (0.0113771)*c + (-0.000279052)*c*c + (3.16144e-06)*c*c*c + (-1.18545e-08)*c*c*c*c ;
 }
-if(fRunNumber==129){
+if(fInternalRunNumber==129){
   v2c=0.0490322 + (-0.00736827)*c + (0.000304529)*c*c + (-4.89472e-06)*c*c*c + (2.60746e-08)*c*c*c*c ;
   v2s=-0.0961198 + (0.0179264)*c + (-0.000914589)*c*c + (1.70145e-05)*c*c*c + (-1.03423e-07)*c*c*c*c ;
 }
-if(fRunNumber==131){
+if(fInternalRunNumber==131){
   v2c=0.075924 + (-0.0108106)*c + (0.000493471)*c*c + (-8.39074e-06)*c*c*c + (4.67109e-08)*c*c*c*c ;
   v2s=0.0700446 + (-0.0105027)*c + (0.00048267)*c*c + (-8.4422e-06)*c*c*c + (4.91292e-08)*c*c*c*c ;
 }
-if(fRunNumber==132){
+if(fInternalRunNumber==132){
   v2c=0.00752887 + (-0.00142672)*c + (7.37857e-05)*c*c + (-1.36894e-06)*c*c*c + (8.28054e-09)*c*c*c*c ;
   v2s=-0.0121719 + (0.00188256)*c + (-8.67104e-05)*c*c + (1.50514e-06)*c*c*c + (-8.79759e-09)*c*c*c*c ;
 }
-if(fRunNumber==133){
+if(fInternalRunNumber==133){
   v2c=0.00242068 + (-0.000274576)*c + (1.06631e-05)*c*c + (-1.45829e-07)*c*c*c + (7.18001e-10)*c*c*c*c ;
   v2s=0.0113182 + (-0.000529549)*c + (-7.75839e-06)*c*c + (4.86382e-07)*c*c*c + (-3.98634e-09)*c*c*c*c ;
 }
-if(fRunNumber==134){
+if(fInternalRunNumber==134){
   v2c=-0.0438721 + (0.00906564)*c + (-0.000407471)*c*c + (6.6254e-06)*c*c*c + (-3.61035e-08)*c*c*c*c ;
   v2s=-0.276264 + (0.0107322)*c + (-0.000281971)*c*c + (3.27634e-06)*c*c*c + (-1.17426e-08)*c*c*c*c ;
 }
-if(fRunNumber==135){
+if(fInternalRunNumber==135){
   v2c=0.0224469 + (-0.00324762)*c + (0.000165861)*c*c + (-3.16496e-06)*c*c*c + (2.011e-08)*c*c*c*c ;
   v2s=-0.308891 + (0.0136721)*c + (-0.00032343)*c*c + (2.93575e-06)*c*c*c + (-5.7637e-09)*c*c*c*c ;
 }
-if(fRunNumber==136){
+if(fInternalRunNumber==136){
   v2c=0.0279685 + (-0.00441)*c + (0.000294342)*c*c + (-6.56635e-06)*c*c*c + (4.53669e-08)*c*c*c*c ;
   v2s=-0.273287 + (0.00917778)*c + (-0.000144155)*c*c + (1.59881e-07)*c*c*c + (8.63874e-09)*c*c*c*c ;
 }
-  
+
 /*
   if(fRunNumber>=1 && fRunNumber<=45){ // 137161 -137848 //period 1
 //    v2c =-3.523975e-03+8.132703e-04*x+-4.107765e-05*x*x+7.308763e-07*x*x*x+-4.285144e-09*x*x*x*x;
@@ -2561,76 +2884,76 @@ if(fRunNumber==136){
     v2c =-1.025964e-02+1.128454e-03*x-4.603917e-05*x*x+7.386637e-07*x*x*x-4.035342e-09*x*x*x*x ;
     v2s =-9.746961e-02+4.672675e-03*x-1.311440e-04*x*x+1.650922e-06*x*x*x-7.083187e-09*x*x*x*x ;
   }
-*/  
+*/
   return phi+v2c*TMath::Sin(2.*phi)-v2s*TMath::Cos(2.*phi) ;
 
 }
 //____________________________________________________________________________
 Double_t  AliAnalysisTaskPi0Flow::ApplyFlattening(Double_t phi, Double_t c){
-  
-  if(fRunNumber==39){ //137748
-    Double_t v2c= 0.0222974-0.00132297*c+0.000204021*c*c-4.49827e-06*c*c*c+2.76986e-08*c*c*c*c ; 
-    Double_t v2s=0.00615401-7.76462e-05*c ;   
+
+
+  if(fInternalRunNumber==39){ //137748
+    Double_t v2c= 0.0222974-0.00132297*c+0.000204021*c*c-4.49827e-06*c*c*c+2.76986e-08*c*c*c*c ;
+    Double_t v2s=0.00615401-7.76462e-05*c ;
     return phi+v2c*TMath::Sin(2.*phi)-v2s*TMath::Cos(2.*phi) ;
   }
-  
-  
+
+
   //Periods 1,2,3
   //fRunNumber - run index
-  if(fRunNumber>=1 && fRunNumber<79){
+  if(fInternalRunNumber>=1 && fInternalRunNumber<79){
     Double_t v2c=4.40516e-04+TMath::Exp(-4.71923-7.62089e-02*c) ;
     Double_t v2s=1.79859e-03+TMath::Exp(-4.99649-7.87523e-02*c) ;
-   
+
     return phi+v2c*TMath::Sin(2.*phi)-v2s*TMath::Cos(2.*phi) ;
   }
-  
+
   //period4
    //138826, 138828, 138830
-  if(fRunNumber==83 ||fRunNumber==84 ||fRunNumber==85 ){
+  if(fInternalRunNumber==83 ||fInternalRunNumber==84 ||fInternalRunNumber==85 ){
      Double_t v2c = -1.4e-03 ;
      Double_t v2s =  -5.60117e-02-TMath::Exp( -1.62827e+00-9.96071e-02*c);
     return phi + v2c*TMath::Sin(2.*phi) - v2s*TMath::Cos(2.*phi) ;
   }
   //Runs 138871,138872
-  if(fRunNumber==87 ||fRunNumber==88 ){   
+  if(fInternalRunNumber==87 ||fInternalRunNumber==88 ){
     Double_t v2c=-0.00518371 ;
     Double_t v2s= 0.00633324 ;
     return phi + v2c*TMath::Sin(2.*phi) - v2s*TMath::Cos(2.*phi) ;
-  }   
+  }
   //run 139029
-  if(fRunNumber==102 ){   
+  if(fInternalRunNumber==102 ){
      Double_t v2c = -0.00354633 ;
      Double_t v2s =  0.00418512 ;
      return phi+v2c*TMath::Sin(2.*phi)-v2s*TMath::Cos(2.*phi) ;
-  }  
-  //run 139110  
+  }
+  //run 139110
 /*
-  if(fRunNumber==110 ){   
+  if(fRunNumber==110 ){
     Double_t v2c=4.78327e-04+TMath::Exp(-3.21625    -6.74306e-02*c) ;
     Double_t v2s=3.50176e-02+TMath::Exp(-9.73541e-01-9.19214e-02*c) ;
     return phi + v2c*TMath::Sin(2.*phi) - v2s*TMath::Cos(2.*phi) ;
   }
 */
-  if(fRunNumber>=79 && fRunNumber<=139){
+  if(fInternalRunNumber>=79 && fInternalRunNumber<=139){
     Double_t v2c= 4.78327e-04 + TMath::Exp(-6.70587-2.33120e-02*c) ;
     Double_t v2s=-2.57731e-03 + TMath::Exp(-2.75493-1.05166e-01*c) ;
-   
+
     return phi + v2c*TMath::Sin(2.*phi) - v2s*TMath::Cos(2.*phi) ;
   }
-  return phi ;  
-  
-}  
+  return phi ;
+
+}
 //____________________________________________________________________________
-Double_t  AliAnalysisTaskPi0Flow::CoreEnergy(AliESDCaloCluster * clu){  
+Double_t  AliAnalysisTaskPi0Flow::CoreEnergy(AliVCluster * clu){
   //calculate energy of the cluster in the circle with radius distanceCut around the maximum
-  
+
   //Can not use already calculated coordinates?
   //They have incidence correction...
   const Double_t distanceCut =3.5 ;
   const Double_t logWeight=4.5 ;
-  
-  Double32_t * elist = clu->GetCellsAmplitudeFraction() ;  
+
+  Double32_t * elist = clu->GetCellsAmplitudeFraction() ;
 // Calculates the center of gravity in the local PHOS-module coordinates
   Float_t wtot = 0;
   Double_t xc[100]={0} ;
@@ -2668,37 +2991,34 @@ Double_t  AliAnalysisTaskPi0Flow::CoreEnergy(AliESDCaloCluster * clu){
 }
 //____________________________________________________________________________
 Bool_t  AliAnalysisTaskPi0Flow::AreNeibors(Int_t id1,Int_t id2){
+  // return true if absId are "Neighbors" (adjacent, including diagornaly,)
+  // false if not.
 
-  Int_t relid1[4] ; 
-  fPHOSGeo->AbsToRelNumbering(id1, relid1) ; 
+  Int_t relid1[4] ;
+  fPHOSGeo->AbsToRelNumbering(id1, relid1) ;
 
-  Int_t relid2[4] ; 
-  fPHOSGeo->AbsToRelNumbering(id2, relid2) ; 
-  if ( (relid1[0] == relid2[0]) && (relid1[1]==relid2[1]) ) { // inside the same PHOS module 
-    Int_t rowdiff = TMath::Abs( relid1[2] - relid2[2] ) ;  
-    Int_t coldiff = TMath::Abs( relid1[3] - relid2[3] ) ;  
-    
-    if (( coldiff <= 1 )  && ( rowdiff <= 1 )){   //At least common vertex
-      //    if (( relid1[2]==relid2[2] && coldiff <= 1 )  || ( relid1[3]==relid2[3] &&  rowdiff <= 1 )){ //common side
-      return 1 ; 
-    }
-    else {
-      if((relid2[2] > relid1[2]) && (relid2[3] > relid1[3]+1)) 
-        return 0; //  Difference in row numbers is too large to look further 
-    }
-    return 0 ;
+  Int_t relid2[4] ;
+  fPHOSGeo->AbsToRelNumbering(id2, relid2) ;
 
-  } 
+  // if inside the same PHOS module
+  if ( (relid1[0] == relid2[0]) && (relid1[1]==relid2[1]) ) {
+    const Int_t rowdiff = TMath::Abs( relid1[2] - relid2[2] ) ;
+    const Int_t coldiff = TMath::Abs( relid1[3] - relid2[3] ) ;
+
+    // and if diff in both direction is 1 or less
+    if (( coldiff <= 1 )  && ( rowdiff <= 1 ))
+      return true; // are neighbors
+  }
 
-  return 0 ; 
+  // else false
+  return false;
 }
 //____________________________________________________________________________
-void  AliAnalysisTaskPi0Flow::Reclusterize(AliESDCaloCluster * clu){
+void  AliAnalysisTaskPi0Flow::Reclusterize(AliVCluster * clu){
   //Re-clusterize to make continues cluster
-  
+
   const Int_t oldMulDigit=clu->GetNCells() ;
-  Double32_t * elist = clu->GetCellsAmplitudeFraction() ;  
+  Double32_t * elist = clu->GetCellsAmplitudeFraction() ;
   UShort_t * dlist = clu->GetCellsAbsId();
 
   Int_t index[oldMulDigit] ;
@@ -2729,16 +3049,16 @@ void  AliAnalysisTaskPi0Flow::Reclusterize(AliESDCaloCluster * clu){
        }
     }
   }
-  
+
   if(inClu==oldMulDigit) //no need to modify
-    return ; 
+    return ;
 
   clu->SetNCells(inClu);
   //copy
   UShort_t tmpD[oldMulDigit] ;
   Double_t tmpE[oldMulDigit] ;
   for(Int_t i=0; i<oldMulDigit; i++){
-    tmpD[i]=dlist[i] ;    
+    tmpD[i]=dlist[i] ;
     tmpE[i]=elist[i] ;
   }
   //change order of digits in list so that
@@ -2747,34 +3067,66 @@ void  AliAnalysisTaskPi0Flow::Reclusterize(AliESDCaloCluster * clu){
     dlist[i]=tmpD[index[i]] ;
     elist[i]=tmpE[index[i]] ;
   }
-  
-  
+
+
+}
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetMisalignment(){
+  // sets the misalignment vertex if ESD
+  if( fEventESD ) {
+    for(Int_t mod=0; mod<5; mod++) {
+      const TGeoHMatrix* modMatrix = fEvent->GetPHOSMatrix(mod);
+      if( ! modMatrix) {
+       if( fDebug > 0 )
+         AliInfo(Form("no PHOS Geometric Misalignment Matrix for module %d", mod));
+       continue;
+      }
+      else {
+       fPHOSGeo->SetMisalMatrix(modMatrix, mod);
+       if( fDebug > 0 )
+         AliInfo("PHOS Geometric Misalignment Matrix");
+      }
+    }
+  }
 }
 
 //_____________________________________________________________________________
-void AliAnalysisTaskPi0Flow::OpenInfoCalbration(Int_t run){
+void AliAnalysisTaskPi0Flow::SetV0Calibration(){
+    // assigns: fMultV0, fV0Cpol, fV0Apol, fMeanQ, and fWidthQ
+
+    int runNumber = this->fRunNumber;
+    
     TString oadbfilename = "$ALICE_ROOT/OADB/PWGCF/VZERO/VZEROcalibEP.root";
     TFile *foadb = TFile::Open(oadbfilename.Data());
 
     if(!foadb){
-       printf("OADB file %s cannot be opened\n",oadbfilename.Data());
+       AliError(Form("OADB file %s cannot be opened\n", oadbfilename.Data()));
+       AliError("V0 Calibration not set !\n");
        return;
     }
 
     AliOADBContainer *cont = (AliOADBContainer*) foadb->Get("hMultV0BefCorr");
     if(!cont){
-       printf("OADB object hMultV0BefCorr is not available in the file\n");
-       return; 
+       AliError("OADB object hMultV0BefCorr is not available in the file");
+       AliError("V0 Calibration not set!\n");
+       return;
     }
 
-    if(!(cont->GetObject(run))){
-       printf("OADB object hMultV0BefCorr is not available for run %i (used run 137366)\n",run);
-       run = 137366;
+    if(!(cont->GetObject(runNumber))){
+       AliError(Form("OADB object hMultV0BefCorr is not available for run %i, trying 137366)",runNumber));
+       runNumber = 137366;
+    }
+    if(!(cont->GetObject(runNumber))){
+       AliError(Form("OADB object hMultV0BefCorr is not available for run %i ",runNumber));
+       AliError("V0 Calibration not set!\n");
+       return;
     }
-    printf("Setting V0 calibration \n") ;
-    fMultV0 = ((TH2F *) cont->GetObject(run))->ProfileX();
 
-    TF1 *fpol0 = new TF1("fpol0","pol0"); 
+    if( fDebug > 0)  AliInfo("Setting V0 calibration") ;
+    fMultV0 = ((TH2F *) cont->GetObject(runNumber))->ProfileX();
+
+    TF1 *fpol0 = new TF1("fpol0","pol0");
     fMultV0->Fit(fpol0,"","",0,31);
     fV0Cpol = fpol0->GetParameter(0);
     fMultV0->Fit(fpol0,"","",32,64);
@@ -2782,7 +3134,7 @@ void AliAnalysisTaskPi0Flow::OpenInfoCalbration(Int_t run){
 
     for(Int_t iside=0;iside<2;iside++){
        for(Int_t icoord=0;icoord<2;icoord++){
-           for(Int_t i=0;i  < nCentrBinV0;i++){
+           for(Int_t i=0;i  < kNCenBins;i++){
                char namecont[100];
                if(iside==0 && icoord==0)
                    snprintf(namecont,100,"hQxc2_%i",i);
@@ -2795,58 +3147,235 @@ void AliAnalysisTaskPi0Flow::OpenInfoCalbration(Int_t run){
 
                cont = (AliOADBContainer*) foadb->Get(namecont);
                if(!cont){
-                   printf("OADB object %s is not available in the file\n",namecont);
-                   return;     
-               }
-               
-               if(!(cont->GetObject(run))){
-                   printf("OADB object %s is not available for run %i (used run 137366)\n",namecont,run);
-                   run = 137366;
+                   AliError(Form("OADB object %s is not available in the file %s", namecont, oadbfilename.Data()));
+                   AliError("V0 Calibration not fully set!\n");
+                   return;
                }
-               fMeanQ[i][iside][icoord] = ((TH1F *) cont->GetObject(run))->GetMean();
-               fWidthQ[i][iside][icoord] = ((TH1F *) cont->GetObject(run))->GetRMS();
-
-               //for v3
-               if(iside==0 && icoord==0)
-                   snprintf(namecont,100,"hQxc3_%i",i);
-               else if(iside==1 && icoord==0)
-                   snprintf(namecont,100,"hQxa3_%i",i);
-               else if(iside==0 && icoord==1)
-                   snprintf(namecont,100,"hQyc3_%i",i);
-               else if(iside==1 && icoord==1)
-                   snprintf(namecont,100,"hQya3_%i",i);
 
-               cont = (AliOADBContainer*) foadb->Get(namecont);
-               if(!cont){
-                   printf("OADB object %s is not available in the file\n",namecont);
-                   return;     
+               if(!(cont->GetObject(runNumber))){
+                   AliError(Form("OADB object %s is not available for run %i, trying run 137366",namecont,runNumber));
+                   runNumber = 137366;
                }
-               
-               if(!(cont->GetObject(run))){
-                   printf("OADB object %s is not available for run %i (used run 137366)\n",namecont,run);
-                   run = 137366;
+               if(!(cont->GetObject(runNumber))){
+                 AliError(Form("OADB object %s is not available for run %i",namecont,runNumber));
+                 AliError("V0 Calibration not fully set!\n");
+                 return;
                }
+               fMeanQ[i][iside][icoord] = ((TH1F *) cont->GetObject(runNumber))->GetMean();
+               fWidthQ[i][iside][icoord] = ((TH1F *) cont->GetObject(runNumber))->GetRMS();
+
+               //for v3
+//             if(iside==0 && icoord==0)
+//                 snprintf(namecont,100,"hQxc3_%i",i);
+//             else if(iside==1 && icoord==0)
+//                 snprintf(namecont,100,"hQxa3_%i",i);
+//             else if(iside==0 && icoord==1)
+//                 snprintf(namecont,100,"hQyc3_%i",i);
+//             else if(iside==1 && icoord==1)
+//                 snprintf(namecont,100,"hQya3_%i",i);
+// 
+//             cont = (AliOADBContainer*) foadb->Get(namecont);
+//             if(!cont){
+//                 AliError(Form("OADB object %s is not available in the file",namecont));
+//                 AliError("V0 Calibration not fully set!\n");
+//                 return;
+//             }
+// 
+//             if(!(cont->GetObject(runNumber))){
+//                 AliError(Form("OADB object %s is not available for run %i, trying run 137366",namecont,runNumber));
+//                 runNumber = 137366;
+//             }
+//             if(!(cont->GetObject(runNumber))){
+//               AliError(Form("OADB object %s is not available for run %i",namecont,runNumber));
+//               AliError("V0 Calibration not fully set!\n");
+//               return;
+//             }
 //             fMeanQv3[i][iside][icoord] = ((TH1F *) cont->GetObject(run))->GetMean();
 //             fWidthQv3[i][iside][icoord] = ((TH1F *) cont->GetObject(run))->GetRMS();
 
            }
        }
     }
+
+    delete fpol0; fpol0=0;
 }
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetESDTrackCuts()
+{
+  if( fEventESD ) {
+    // Create ESD track cut
+    fESDtrackCuts = AliESDtrackCuts::GetStandardTPCOnlyTrackCuts() ;
+    //fESDtrackCuts = AliESDtrackCuts::GetStandardITSTPCTrackCuts2010();
+    fESDtrackCuts->SetRequireTPCRefit(kTRUE);
+  }
+}
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetGeometry()
+{
+  // Initialize the PHOS geometry
+  if( kLHC10h == fPeriod ) {
+    TGeoManager::Import("geometry.root"); //TODO: should perhaps not be done
+    fPHOSGeo = AliPHOSGeometry::GetInstance("IHEP") ;
+    if( ! fPHOSGeo )
+      AliError("geometry (fPHOSGeo) not initialised");
+  }
+
+  //Init geometry
+  if(!fPHOSGeo){
+    AliOADBContainer geomContainer("phosGeo");
+    geomContainer.InitFromFile("$ALICE_ROOT/OADB/PHOS/PHOSGeometry.root","PHOSRotationMatrixes");
+    TObjArray *matrixes = (TObjArray*)geomContainer.GetObject(fRunNumber,"PHOSRotationMatrixes");
+    fPHOSGeo =  AliPHOSGeometry::GetInstance("IHEP") ;
+    for(Int_t mod=0; mod<5; mod++) {
+      if(!matrixes->At(mod)) {
+       continue;
+       if( fDebug > 0 )
+         AliInfo(Form("No PHOS Matrix for mod:%d, geo=%p\n", mod, fPHOSGeo));
+      }
+      else {
+       fPHOSGeo->SetMisalMatrix(((TGeoHMatrix*)matrixes->At(mod)),mod) ;
+       if( fDebug >1 )
+         AliInfo(Form("Adding PHOS Matrix for mod:%d, geo=%p\n", mod, fPHOSGeo));
+      }
+    }
+  } 
+}
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetPHOSCalibData()
+{
+  if( fPHOSCalibData )
+    delete fPHOSCalibData; 
+  fPHOSCalibData = 0;
   
+  // Calibration only needed for ESD
+  if( fEventESD /*&& */ ) {
+    if( kLHC10h == fPeriod ) {
+      //We have to apply re-calibration for pass1 LCH10h
+      // Initialize decalibration factors in the form of the OCDB object
+      AliCDBManager * man = AliCDBManager::Instance();
+      man->SetRun(140000) ; //TODO; revise, this should probably not b done.
+      man->SetDefaultStorage("local://OCDB");
+    }
+    fPHOSCalibData = new AliPHOSCalibData();
+  }
+}
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetVertex()
+{
+  const AliVVertex *primaryVertex = fEvent->GetPrimaryVertex();
+  if( primaryVertex ) {
+    fVertex[0] = primaryVertex->GetX();
+    fVertex[1] = primaryVertex->GetY();
+    fVertex[2] = primaryVertex->GetZ();
+  }
+  else {
+    AliError("Event has 0x0 Primary Vertex, defaulting to origo");
+    fVertex[0] = 0;
+    fVertex[1] = 0;
+    fVertex[2] = 0;
+  }
+  fVertexVector = TVector3(fVertex);
+  FillHistogram("hZvertex", fVertexVector.z(), fInternalRunNumber-0.5);
+
+  fVtxBin=0 ;// No support for vtx binning implemented.
+}
+
+//_____________________________________________________________________________
+Bool_t AliAnalysisTaskPi0Flow::RejectEventVertex()
+{
+  if( ! fEvent->GetPrimaryVertex() )
+    return true; // reject
+  if ( TMath::Abs(fVertexVector.z()) > 10. )
+    return true; // reject
+
+  return false; // accept event.
+}
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::SetCentrality()
+{
+  AliCentrality *centrality = fEvent->GetCentrality();
+  if( centrality )
+    fCentralityV0M=centrality->GetCentralityPercentile("V0M");
+  else {
+    AliError("Event has 0x0 centrality");
+    fCentralityV0M = -1.;
+  }
+  FillHistogram("hCentrality",fCentralityV0M,fInternalRunNumber-0.5) ;
+
+  fCentBin = GetCentralityBin(fCentralityV0M);
+}
+
+//_____________________________________________________________________________
+Bool_t AliAnalysisTaskPi0Flow::RejectCentrality()
+{
+  if( ! fEvent->GetCentrality() )
+    return true; // reject
+//   if( fCentralityV0M <= 0. || fCentralityV0M>80. )
+//     return true; // reject
+    
+  int lastBinUpperIndex = fCentEdges.GetSize() -1;
+  if( fCentralityV0M > fCentEdges[lastBinUpperIndex] )
+    return true; // reject
+  if( fCentralityV0M < fCentEdges[0] ) 
+    return true; // reject
+
+  return false;
+}
+
+
+//_____________________________________________________________________________
+void AliAnalysisTaskPi0Flow::EvalReactionPlane()
+{
+  // assigns: fHaveTPCRP and fRP
+  // also does a few histogram fills
+
+  AliEventplane *eventPlane = fEvent->GetEventplane();
+  Double_t reactionPlaneQ = eventPlane->GetEventplane("Q");
+  FillHistogram("phiRP",reactionPlaneQ,fCentralityV0M) ;
+
+  if(reactionPlaneQ==999 || reactionPlaneQ < 0.){ //reaction plain was not defined
+    fHaveTPCRP = false;
+    fRP=0.;
+  }
+  else{
+    fHaveTPCRP = true;
+  }
+  if(fHaveTPCRP){
+    if( kLHC10h == fPeriod )
+      fRP = ApplyFlattening(reactionPlaneQ, fCentralityV0M) ;
+    else if ( fEventAOD )
+      fRP = reactionPlaneQ;
+    else
+      AliError("Don't know how to set fRP");
+
+    while(fRP<0)  fRP+=TMath::Pi();
+    while(fRP>TMath::Pi())  fRP-=TMath::Pi();
+    FillHistogram("phiRPflat",fRP,fCentralityV0M) ;
+    Double_t dPsi = eventPlane->GetQsubRes() ;
+    FillHistogram("cos2AC",TMath::Cos(2.*dPsi),fCentralityV0M) ;
+  }
+}
+
+
 //____________________________________________________________________________
-void  AliAnalysisTaskPi0Flow::EvalV0ReactionPlane(AliESDEvent * event){
+void  AliAnalysisTaskPi0Flow::EvalV0ReactionPlane(){
+  // set: fRPV0A and fRPV0C
 
   //VZERO data
-  AliESDVZERO* esdV0 = event->GetVZEROData();
+  AliVVZERO* v0 = fEvent->GetVZEROData();
 
-  //reset Q vector info        
+  //reset Q vector info
   Double_t Qxa2 = 0, Qya2 = 0;
   Double_t Qxc2 = 0, Qyc2 = 0;
 
   for (Int_t iv0 = 0; iv0 < 64; iv0++) {
     Double_t phiV0 = TMath::PiOver4()*(0.5 + iv0 % 8);
-    Float_t multv0 = esdV0->GetMultiplicity(iv0);
+    Float_t multv0 = v0->GetMultiplicity(iv0);
     if (iv0 < 32){ // V0C
       Qxc2 += TMath::Cos(2*phiV0) * multv0*fV0Cpol/fMultV0->GetBinContent(iv0+1);
       Qyc2 += TMath::Sin(2*phiV0) * multv0*fV0Cpol/fMultV0->GetBinContent(iv0+1);
@@ -2856,16 +3385,16 @@ void  AliAnalysisTaskPi0Flow::EvalV0ReactionPlane(AliESDEvent * event){
     }
   }
 
-  Int_t iC = -1;    
+  Int_t iC = -1;
   // centrality bins
-  if(fCentrality < 5) iC = 0;
-  else if(fCentrality < 10) iC = 1;
-  else if(fCentrality < 20) iC = 2;
-  else if(fCentrality < 30) iC = 3;
-  else if(fCentrality < 40) iC = 4;
-  else if(fCentrality < 50) iC = 5;
-  else if(fCentrality < 60) iC = 6;
-  else if(fCentrality < 70) iC = 7;
+  if(fCentralityV0M < 5) iC = 0;
+  else if(fCentralityV0M < 10) iC = 1;
+  else if(fCentralityV0M < 20) iC = 2;
+  else if(fCentralityV0M < 30) iC = 3;
+  else if(fCentralityV0M < 40) iC = 4;
+  else if(fCentralityV0M < 50) iC = 5;
+  else if(fCentralityV0M < 60) iC = 6;
+  else if(fCentralityV0M < 70) iC = 7;
   else iC = 8;
 
     //grab for each centrality the proper histo with the Qx and Qy to do the recentering
@@ -2873,32 +3402,49 @@ void  AliAnalysisTaskPi0Flow::EvalV0ReactionPlane(AliESDEvent * event){
   Double_t Qxarms2  = fWidthQ[iC][1][0];
   Double_t Qyamean2 = fMeanQ[iC][1][1];
   Double_t Qyarms2  = fWidthQ[iC][1][1];
-    
+
   Double_t Qxcmean2 = fMeanQ[iC][0][0];
   Double_t Qxcrms2  = fWidthQ[iC][0][0];
   Double_t Qycmean2 = fMeanQ[iC][0][1];
-  Double_t Qycrms2  = fWidthQ[iC][0][1];       
-    
+  Double_t Qycrms2  = fWidthQ[iC][0][1];
+
   Double_t QxaCor2 = (Qxa2 - Qxamean2)/Qxarms2;
   Double_t QyaCor2 = (Qya2 - Qyamean2)/Qyarms2;
   Double_t QxcCor2 = (Qxc2 - Qxcmean2)/Qxcrms2;
   Double_t QycCor2 = (Qyc2 - Qycmean2)/Qycrms2;
-       
+
   fRPV0A = TMath::ATan2(QyaCor2, QxaCor2)/2.;
   fRPV0C = TMath::ATan2(QycCor2, QxcCor2)/2.;
 
   while(fRPV0A<0)fRPV0A+=TMath::Pi() ;
   while(fRPV0A>TMath::Pi())fRPV0A-=TMath::Pi() ;
-  FillHistogram("phiRPV0A",fRPV0A,fCentrality) ;
-  fRPV0A=ApplyFlatteningV0A(fRPV0A,fCentrality) ;
+
+  fRPV0A=ApplyFlatteningV0A(fRPV0A,fCentralityV0M) ;
   while(fRPV0A<0)fRPV0A+=TMath::Pi() ;
   while(fRPV0A>TMath::Pi())fRPV0A-=TMath::Pi() ;
-  
+
   while(fRPV0C<0)fRPV0C+=TMath::Pi() ;
   while(fRPV0C>TMath::Pi())fRPV0C-=TMath::Pi() ;
-  FillHistogram("phiRPV0C",fRPV0C,fCentrality) ;
-  fRPV0C=ApplyFlatteningV0C(fRPV0C,fCentrality) ;
+
+  fRPV0C=ApplyFlatteningV0C(fRPV0C,fCentralityV0M) ;
   while(fRPV0C<0)fRPV0C+=TMath::Pi() ;
   while(fRPV0C>TMath::Pi())fRPV0C-=TMath::Pi() ;
 
+
+  FillHistogram("phiRPV0A",fRPV0A,fCentralityV0M);
+  FillHistogram("phiRPV0C",fRPV0C,fCentralityV0M);
+
+  FillHistogram("phiRPV0Aflat",fRPV0A,fCentralityV0M) ;
+  FillHistogram("phiRPV0AC",fRPV0A,fRPV0C,fCentralityV0M) ;
+  FillHistogram("cos2V0AC",TMath::Cos(2.*(fRPV0A-fRPV0C)),fCentralityV0M) ;
+  if(fHaveTPCRP){
+    FillHistogram("phiRPV0ATPC",fRP,fRPV0A,fCentralityV0M) ;
+    FillHistogram("cos2V0ATPC",TMath::Cos(2.*(fRP-fRPV0A)),fCentralityV0M) ;
+  }
+
+  FillHistogram("phiRPV0Cflat",fRPV0C,fCentralityV0M) ;
+  if(fHaveTPCRP){
+    FillHistogram("phiRPV0CTPC",fRP,fRPV0C,fCentralityV0M) ;
+    FillHistogram("cos2V0CTPC",TMath::Cos(2.*(fRP-fRPV0C)),fCentralityV0M) ;
+  }
 }
index 3220728..35abd24 100644 (file)
-#ifndef AliAnalysisTaskPi0Flow_cxx\r
-#define AliAnalysisTaskPi0Flow_cxx\r
-\r
-// example of an analysis task creating a p_t spectrum\r
-// Authors: Panos Cristakoglou, Jan Fiete Grosse-Oetringhaus, Christian Klein-Boesing\r
-\r
-class TObjArray;\r
-class TH1F;\r
-class TH2I;\r
-class TH2F;\r
-class TH3F;\r
-class TF1 ;\r
-class AliStack ;\r
-class AliESDtrackCuts;\r
-class AliPHOSGeometry;\r
-class AliESDEvent ;\r
-class AliPHOSCalibData;\r
-class AliESDtrack ;\r
-class AliESDCaloCluster ;\r
-\r
-#include "AliAnalysisTaskSE.h"\r
-\r
-class AliAnalysisTaskPi0Flow : public AliAnalysisTaskSE {\r
-public:\r
-  AliAnalysisTaskPi0Flow(const char *name = "AliAnalysisTaskPi0Flow");\r
-  virtual ~AliAnalysisTaskPi0Flow() {}\r
-  \r
-  virtual void   UserCreateOutputObjects();\r
-  virtual void   UserExec(Option_t *option);\r
-  virtual void   Terminate(Option_t *);\r
-  void SetPHOSBadMap(Int_t mod,TH2I * h)\r
-  {\r
-    if(fPHOSBadMap[mod]) delete fPHOSBadMap[mod] ;\r
-    fPHOSBadMap[mod]=new TH2I(*h) ;\r
-    printf("Set %s \n",fPHOSBadMap[mod]->GetName());\r
-  }\r
-  \r
-private:\r
-  AliAnalysisTaskPi0Flow(const AliAnalysisTaskPi0Flow&); // not implemented\r
-  AliAnalysisTaskPi0Flow& operator=(const AliAnalysisTaskPi0Flow&); // not implemented\r
-  Bool_t IsGoodChannel(const char * det, Int_t mod,Int_t ix, Int_t iz); //Use addisional bad map for PHOS\r
-\r
-  void FillHistogram(const char * key,Double_t x) const ; //Fill 1D histogram witn name key\r
-  void FillHistogram(const char * key,Double_t x, Double_t y) const ; //Fill 2D histogram witn name key\r
-  void FillHistogram(const char * key,Double_t x, Double_t y, Double_t z) const ; //Fill 3D histogram witn name key\r
-\r
-  Bool_t TestLambda(Double_t pt,Double_t l1,Double_t l2) ;  //Evaluate Dispersion cuts for photons\r
-  Bool_t TestLambda2(Double_t pt,Double_t l1,Double_t l2) ;  //Evaluate Dispersion cuts for photons\r
-  Double_t TestCPV(Double_t dx, Double_t dz, Double_t pt, Int_t charge);\r
-  Int_t ConvertRunNumber(Int_t run) ; \r
-\r
-  void OpenInfoCalbration(Int_t run); //V0 calibration\r
-  void EvalV0ReactionPlane(AliESDEvent * event) ;\r
-  Double_t ApplyFlattening(Double_t phi, Double_t c) ; //Apply centrality-dependent flattening\r
-  Double_t ApplyFlatteningV0A(Double_t phi, Double_t c) ; //Apply centrality-dependent flattening\r
-  Double_t ApplyFlatteningV0C(Double_t phi, Double_t c) ; //Apply centrality-dependent flattening\r
-\r
-  Double_t CoreEnergy(AliESDCaloCluster * clu); \r
-  void    Reclusterize(AliESDCaloCluster * clu) ;\r
-  Bool_t  AreNeibors(Int_t id1,Int_t id2) ;\r
-private:\r
-  AliESDtrackCuts *fESDtrackCuts; // Track cut\r
-  AliStack * fStack ;\r
-  TList * fOutputContainer;        //final histogram container\r
-  TList * fPHOSEvents[1][10][11] ; //Containers for events with PHOS photons\r
-  TClonesArray * fPHOSEvent ;      //PHOS photons in current event\r
-  AliPHOSCalibData *fPHOSCalibData; // PHOS calibration object\r
-  TF1 *fNonLinCorr;          // Non-linearity correction\r
\r
-  //Reaction plain for v2\r
-  Float_t fRP ; //!Reaction plane calculated with full TPC \r
-  Float_t fRPV0A ;    //!Reaction plain calculated with A-side TPC: eta>0.15 \r
-  Float_t fRPV0C ;    //!Reaction plain calculated with C-side TPC: eta<-0.15\r
-  Bool_t fHaveTPCRP ; //! Is TPC RP defined?\r
-  \r
-  //V0 calibration\r
-\r
-  static const Int_t nCentrBinV0 = 9; // # cenrality bins\r
-\r
-  TProfile *fMultV0;                  // object containing VZERO calibration information\r
-\r
-  Float_t fV0Cpol,fV0Apol;            // loaded by OADB\r
-\r
-  Float_t fMeanQ[nCentrBinV0][2][2];    // and recentering\r
-\r
-  Float_t fWidthQ[nCentrBinV0][2][2];   // ...\r
-\r
-\r
-//  TF1 * fRecent[5][12] ;//Recentering corrections\r
-\r
-  Int_t fRunNumber ;    //Current run number\r
-  Float_t fCentrality ; //!Centrality of the currecnt event\r
-\r
-  Int_t fCenBin ;       //! Current centrality bin\r
-\r
-  TH2I *fPHOSBadMap[6] ;    //Container for PHOS bad channels map\r
-\r
-  AliPHOSGeometry  *fPHOSGeo;  //! PHOS geometry\r
-  Int_t fEventCounter;         // number of analyzed events\r
-\r
-  ClassDef(AliAnalysisTaskPi0Flow, 1); // PHOS analysis task\r
-};\r
-\r
-#endif\r
+#ifndef AliAnalysisTaskPi0Flow_cxx
+#define AliAnalysisTaskPi0Flow_cxx
+
+// Analysis task to fill histograms with PHOS ESD or AOD clusters and cells
+// Authors : Dmitri Peressounko
+// Date    : 28.05.2011
+// Modified: 03.08.2012 Henrik Qvigstad
+
+class TObjArray;
+class TH1F;
+class TH2I;
+class TH2F;
+class TH3F;
+class TF1 ;
+class AliStack ;
+class AliESDtrackCuts;
+class AliPHOSGeometry;
+class AliESDEvent ;
+class AliPHOSCalibData;
+class AliESDtrack ;
+class AliESDCaloCluster ;
+
+#include "TArrayD.h"
+
+#include "AliAnalysisTaskSE.h"
+
+class AliAnalysisTaskPi0Flow : public AliAnalysisTaskSE {
+public:
+    enum Period { kUndefinedPeriod, kLHC10h, kLHC11h };
+
+public:
+    AliAnalysisTaskPi0Flow(const char *name = "AliAnalysisTaskPi0Flow", Period period = kUndefinedPeriod);
+    virtual ~AliAnalysisTaskPi0Flow();
+
+    virtual void   UserCreateOutputObjects();
+    virtual void   UserExec(Option_t *option);
+    virtual void   Terminate(Option_t *);
+
+    void SetPeriod(Period period) { fPeriod = period;}
+    
+    void SetCentralityBinning(const TArrayD& edges);
+    void SetEventMixingRPBinning(UInt_t nBins) { fNEMRPBins = nBins; }
+    void SetMixingArraysLength(UInt_t length) { fMixingArraysLength = length; }
+    
+    void SetPHOSBadMap(Int_t mod,TH2I * badMapHist);
+
+
+private:
+    AliAnalysisTaskPi0Flow(const AliAnalysisTaskPi0Flow&); // not implemented
+    AliAnalysisTaskPi0Flow& operator=(const AliAnalysisTaskPi0Flow&); // not implemented
+
+    // Step 0:
+    AliVEvent* GetEvent();
+    AliStack* GetMCStack();
+
+    // Step 1:
+    void SetGeometry();
+    void SetMisalignment();
+    void SetV0Calibration(); //V0 calibration
+    void SetESDTrackCuts(); // AliESDtrack cuts ( for esd data )
+    void SetPHOSCalibData(); // phos re-calibration ( for esd data)
+
+    // Step 2:
+    void SetVertex();
+    Bool_t RejectEventVertex();
+
+    // Step 4:
+    void SetCentrality();
+    Bool_t RejectCentrality();
+
+    // Step 5:
+    void EvalReactionPlane();
+    void EvalV0ReactionPlane();
+
+    // Step 7: QA PHOS cells
+    void FillPHOSCellQAHists();
+
+    // Step 8: Event Photons (PHOS Clusters) selection
+    void SelectPhotonClusters();
+    void FillSelectedClusterHistograms();
+
+    // Step 9: Consider pi0 (photon/cluster) pairs.
+    void ConsiderPi0s();
+
+    // Step 10; Mixing
+    void ConsiderPi0sMix();
+
+    // Step 11: Update lists
+    void UpdateLists();
+
+    Bool_t AreNeibors(Int_t id1,Int_t id2) ;
+    Double_t ApplyFlattening(Double_t phi, Double_t c) ; //Apply centrality-dependent flattening
+    Double_t ApplyFlatteningV0A(Double_t phi, Double_t c) ; //Apply centrality-dependent flattening
+    Double_t ApplyFlatteningV0C(Double_t phi, Double_t c) ; //Apply centrality-dependent flattening
+    Int_t ConvertToInternalRunNumber(Int_t run) ;
+    Double_t CoreEnergy(AliVCluster * clu);
+
+
+
+
+    void FillHistogram(const char * key,Double_t x) const ; //Fill 1D histogram witn name key
+    void FillHistogram(const char * key,Double_t x, Double_t y) const ; //Fill 2D histogram witn name key
+    void FillHistogram(const char * key,Double_t x, Double_t y, Double_t z) const ; //Fill 3D histogram witn name key
+
+    TVector3 GetVertexVector(const AliVVertex* vertex);
+    Int_t GetCentralityBin(Float_t centralityV0M);
+    Int_t GetRPBin();
+
+    void LogProgress(int step, int internalRunNumber);
+
+    Bool_t IsGoodChannel(const char * det, Int_t mod,Int_t ix, Int_t iz); //Use addisional bad map for PHOS
+
+
+    void Reclusterize(AliVCluster * clu) ;
+    Double_t TestCPV(Double_t dx, Double_t dz, Double_t pt, Int_t charge);
+    Bool_t TestLambda(Double_t pt,Double_t l1,Double_t l2) ;  //Evaluate Dispersion cuts for photons
+    Bool_t TestLambda2(Double_t pt,Double_t l1,Double_t l2) ;  //Evaluate Dispersion cuts for photons
+    
+    UInt_t GetNumberOfCentralityBins() { return fCentEdges.GetSize()-1; }
+    TList* GetCaloPhotonsPHOSList(UInt_t vtxBin, UInt_t centBin, UInt_t rpBin);
+    
+
+
+
+private:
+    // constants:
+    static const Double_t kLogWeight= 4.5 ; // log weight for recalibration.
+    static const Double_t kAlphaCut=0.7 ;
+    static const Bool_t doESDReCalibration = kTRUE;
+    static const Int_t kNCenBins = 9; // see EvalV0ReactionPlane()
+
+    // cluster cut variables:
+    static const Double_t kMinClusterEnergy = 0.3;
+    static const Int_t kMinNCells = 3;
+    static const Double_t kMinM02 = 0.2;
+
+    // Binning, [vtx, centrality, reaction-plane]
+    static const Int_t kNVtxZBins = 1;
+    static const Double_t kCentCutoff = 90.; // Ignore Centrality over 90%
+    TArrayD fCentEdges; // Centrality Bin Lower edges,
+    UInt_t fNEMRPBins;
+    
+    UInt_t fMixingArraysLength;
+    
+
+    Period fPeriod;
+
+    TList * fOutputContainer;        //final histogram container
+
+    TF1 *fNonLinCorr;          // Non-linearity correction
+//TF1 * fRecent[5][12] ;//Recentering corrections
+    TH2I *fPHOSBadMap[6] ;    //Container for PHOS bad channels map
+
+    // Run variables
+
+    // Step 0: Event Objects
+    // fEvent, fMCStack
+    AliVEvent* fEvent; //! Current event
+    AliESDEvent* fEventESD; //! Current event, if ESD.
+    AliAODEvent* fEventAOD; //! Current event, if AOD.
+    AliStack * fMCStack ;
+
+    // Step 1: Run Number, Misalignment Matrix, and Calibration
+    Int_t fRunNumber; // run number
+    Int_t fInternalRunNumber ;    //Current internal run number
+    AliPHOSGeometry  *fPHOSGeo;  //! PHOS geometry
+    TProfile *fMultV0;                  // object containing VZERO calibration information
+    Float_t fV0Cpol,fV0Apol;            // loaded by OADB
+    Float_t fMeanQ[kNCenBins][2][2];    // and recentering
+    Float_t fWidthQ[kNCenBins][2][2];   // ...
+    AliESDtrackCuts *fESDtrackCuts; // Track cut
+    AliPHOSCalibData *fPHOSCalibData; // PHOS calibration object
+
+    // Step 2: Vertex
+    Double_t fVertex[3];
+    TVector3 fVertexVector;
+    Int_t fVtxBin;
+
+    // Step 4: Centrality
+    Float_t fCentralityV0M ; //!Centrality of the currecnt event
+    Int_t fCentBin ;       //! Current centrality bin
+
+    // Step 5: Reaction Plane
+    Bool_t fHaveTPCRP ; //! Is TPC RP defined?
+    Float_t fRP ;       //!Reaction plane calculated with full TPC
+    Float_t fRPV0A ;    //!Reaction plain calculated with A-side TPC: eta>0.15
+    Float_t fRPV0C ;    //!Reaction plain calculated with C-side TPC: eta<-0.15
+    Int_t fEMRPBin;       //! Event Mixing Reaction Plane Bin
+
+    // Step 8: Event Photons (PHOS Clusters) selection
+    TObjArray * fCaloPhotonsPHOS ;      //PHOS photons in current event
+
+    // Step 11: Update lists for mixing.
+    TObjArray* fCaloPhotonsPHOSLists; //! array of TList, Containers for events with PHOS photons
+
+
+    ClassDef(AliAnalysisTaskPi0Flow, 1); // PHOS analysis task
+};
+
+#endif