modified deltaphi calculation and supporting binning

diff --git a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysisPbPbAOD.cxx b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysisPbPbAOD.cxx
index 012179d376b79f9de2d2f6f300979c32b310632b..fb9b60ef22e2f5a0a37242fedbb6df5385264907 100644 (file)
--- a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysisPbPbAOD.cxx
+++ b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysisPbPbAOD.cxx
@@ -874,7 +874,7 @@ void AlidNdPtAnalysisPbPbAOD::UserExec(Option_t *option)
          dMCTrackZvPtEtaCent[3] = dCentrality;
          fMCGenZvPtEtaCent->Fill(dMCTrackZvPtEtaCent);
          
-         dMCTrackPhiPtEtaCent[0] = mcPart->Phi() - dEventplaneAngle;//RotatePhi(mcPart->Phi(), dEventplaneAngle); // use eventplane and not reactionplan, similar to centrality vs impact paramter
+         dMCTrackPhiPtEtaCent[0] = RotatePhi(mcPart->Phi(), dEventplaneAngle); // use eventplane and not reactionplan, similar to centrality vs impact paramter
          //      if( dMCTrackPhiPtEtaCent[0] < 0) dMCTrackPhiPtEtaCent[0] += 2.*TMath::Pi();
          //      else if( dMCTrackPhiPtEtaCent[0] > 2.*TMath::Pi()) dMCTrackPhiPtEtaCent[0] -= 2.*TMath::Pi();
          dMCTrackPhiPtEtaCent[1] = mcPart->Pt();
@@ -988,7 +988,7 @@ void AlidNdPtAnalysisPbPbAOD::UserExec(Option_t *option)
        fCorrelEventplaneDefaultCorrected->Fill(dFillEPCorrectionCheck);
        
        
-       dTrackPhiPtEtaCent[0] = track->Phi() - dEventplaneAngleCorrected;//RotatePhi(track->Phi(), dEventplaneAngleCorrected); 
+       dTrackPhiPtEtaCent[0] = RotatePhi(track->Phi(), dEventplaneAngleCorrected); 
        
        //      if( dTrackPhiPtEtaCent[0] < -1.0*TMath::Pi()) dTrackPhiPtEtaCent[0] += 2.*TMath::Pi();
        //      else if( dTrackPhiPtEtaCent[0] > TMath::Pi()) dTrackPhiPtEtaCent[0] -= 2.*TMath::Pi();
@@ -1014,7 +1014,7 @@ void AlidNdPtAnalysisPbPbAOD::UserExec(Option_t *option)
          dMCTrackZvPtEtaCent[2] = mcPart->Eta();
          dMCTrackZvPtEtaCent[3] = dCentrality;
          
-         dMCTrackPhiPtEtaCent[0] = mcPart->Phi() - dEventplaneAngle;//RotatePhi(mcPart->Phi(), dEventplaneAngle); // use eventplane and not reactionplan, similar to centrality vs impact paramter
+         dMCTrackPhiPtEtaCent[0] = RotatePhi(mcPart->Phi(), dEventplaneAngle); // use eventplane and not reactionplan, similar to centrality vs impact paramter
          
          //      if( dMCTrackPhiPtEtaCent[0] < -1.0*TMath::Pi()) dMCTrackPhiPtEtaCent[0] += 2.*TMath::Pi();
          //      else if( dMCTrackPhiPtEtaCent[0] > TMath::Pi()) dMCTrackPhiPtEtaCent[0] -= 2.*TMath::Pi();
@@ -1149,32 +1149,49 @@ Double_t AlidNdPtAnalysisPbPbAOD::MoveEventplane(Double_t dMCEP)
 Double_t AlidNdPtAnalysisPbPbAOD::RotatePhi(Double_t phiTrack, Double_t phiEP)
 {
   Double_t dPhi = 0;
-  dPhi = phiTrack - phiEP;
-  if ((dPhi >= -1./2. * TMath::Pi() ) && 
-       (dPhi <= 1./2. * TMath::Pi() ) )
-  {
-       return dPhi;
-  }
+  dPhi = TMath::Abs(phiTrack - phiEP);
   
-  if( (dPhi < 0) )
+  if( dPhi <= TMath::Pi() )
   {
-       dPhi += 2.*TMath::Pi();
+       return dPhi;
   }
-  
-  if ((dPhi > 0) && 
-       (dPhi > 1./2. * TMath::Pi() ) && 
-       (dPhi <= 3./2. * TMath::Pi() ) )
+  if( (dPhi > TMath::Pi()) && (dPhi <= 3./2.*TMath::Pi()) )
   {
-       dPhi -= TMath::Pi();
+       dPhi = dPhi - TMath::Pi()/2.;
        return dPhi;
-  }    
-  
-  if ((dPhi > 0) && 
-       (dPhi > 3./2. * TMath::Pi() )) 
+  }
+  if( (dPhi > 3./2.*TMath::Pi()) )
   {
-       dPhi -= 2.*TMath::Pi();
+       dPhi = dPhi - 3./2.*TMath::Pi();
        return dPhi;
   }
+//   if( dPhi < 0 )
+//   
+//   if ((dPhi >= -1./2. * TMath::Pi() ) && 
+//     (dPhi <= 1./2. * TMath::Pi() ) )
+//   {
+//     return dPhi;
+//   }
+//   
+//   if( (dPhi < 0) )
+//   {
+//     dPhi += 2.*TMath::Pi();
+//   }
+//   
+//   if ((dPhi > 0) && 
+//     (dPhi > 1./2. * TMath::Pi() ) && 
+//     (dPhi <= 3./2. * TMath::Pi() ) )
+//   {
+//     dPhi -= TMath::Pi();
+//     return dPhi;
+//   } 
+//   
+//   if ((dPhi > 0) && 
+//     (dPhi > 3./2. * TMath::Pi() )) 
+//   {
+//     dPhi -= 2.*TMath::Pi();
+//     return dPhi;
+//   }
   
   //   Printf("[E] dphi = %.4f , phiTrack = %.4f, phiEP = %.4f", dPhi, phiTrack, phiEP);
   

diff --git a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/AddTask_dNdPt_PbPbAOD.C b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/AddTask_dNdPt_PbPbAOD.C
index 7ebda9391ddd72f1315ba7cdaafe502427301088..8ab10d0f33ee508da9bc27eed8233e90003f3f1d 100644 (file)
--- a/PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/AddTask_dNdPt_PbPbAOD.C
+++ b/PWGLF/SPECTRA/ChargedHadrons/dNdPt/macros/AddTask_dNdPt_PbPbAOD.C
@@ -60,13 +60,16 @@ AlidNdPtAnalysisPbPbAOD *AddTask_dNdPt_PbPbAOD( UInt_t uTriggerMask = AliVEvent:
 //     10./8.*TMath::Pi(), 11./8.*TMath::Pi(), 12./8.*TMath::Pi(), 13./8.*TMath::Pi(), 14./8.*TMath::Pi(), 15./8.*TMath::Pi(), 2.*TMath::Pi()
 //   };
 
-  Double_t binsPhi[] = {
-       -2.*TMath::Pi(), -1.75*TMath::Pi(), -1.5*TMath::Pi(), -1.25*TMath::Pi(), 
-       -1.*TMath::Pi(), -0.75*TMath::Pi(), -0.5*TMath::Pi(), -0.25*TMath::Pi(), 
-       0, 0.25*TMath::Pi(), 0.5*TMath::Pi(), 0.75*TMath::Pi(), TMath::Pi(),
-       1.25*TMath::Pi(), 1.5*TMath::Pi(), 1.75*TMath::Pi(), 2.*TMath::Pi()
-  };
-  
+//   Double_t binsPhi[] = {
+//     -2.*TMath::Pi(), -1.75*TMath::Pi(), -1.5*TMath::Pi(), -1.25*TMath::Pi(), 
+//     -1.*TMath::Pi(), -0.75*TMath::Pi(), -0.5*TMath::Pi(), -0.25*TMath::Pi(), 
+//     0, 0.25*TMath::Pi(), 0.5*TMath::Pi(), 0.75*TMath::Pi(), TMath::Pi(),
+//     1.25*TMath::Pi(), 1.5*TMath::Pi(), 1.75*TMath::Pi(), 2.*TMath::Pi()
+//   };
+Double_t binsPhi[] = {
+  0, 0.25*TMath::Pi(), 0.5*TMath::Pi(), 0.75*TMath::Pi(), TMath::Pi()
+};
+
   Int_t nBinPhi = sizeof(binsPhi)/sizeof(Double_t);
   task->SetBinsPhi(nBinPhi, binsPhi);