adding possibility for per trigger normalization (Jan Fiete Style)

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
index 4ca2c16429ea3d5384c4572569086cb33db0b3f7..711718a9d5e1ad35921e6842c4c974a564de7819 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.cxx
@@ -929,7 +929,8 @@ TH2D *AliBalancePsi::GetCorrelationFunctionPN(Double_t psiMin,
                                              Double_t ptTriggerMin,
                                              Double_t ptTriggerMax,
                                              Double_t ptAssociatedMin,
-                                             Double_t ptAssociatedMax) {
+                                             Double_t ptAssociatedMax,
+                                             Bool_t   normToTrig) {
   //Returns the 2D correlation function for (+-) pairs
   // Psi_2: axis 0
   fHistP->GetGrid(0)->GetGrid()->GetAxis(0)->SetRangeUser(psiMin,psiMax); 
@@ -974,7 +975,7 @@ TH2D *AliBalancePsi::GetCorrelationFunctionPN(Double_t psiMin,
   //c2->cd();
   //fHistPN->Project(0,1,2)->DrawCopy("colz");
 
-  if((Double_t)(fHistP->Project(0,1)->GetEntries())!=0)
+  if(normToTrig && (Double_t)(fHistP->Project(0,1)->GetEntries())!=0)
     gHist->Scale(1./(Double_t)(fHistP->Project(0,1)->GetEntries()));
     
   return gHist;
@@ -986,7 +987,8 @@ TH2D *AliBalancePsi::GetCorrelationFunctionNP(Double_t psiMin,
                                              Double_t ptTriggerMin,
                                              Double_t ptTriggerMax,
                                              Double_t ptAssociatedMin,
-                                             Double_t ptAssociatedMax) {
+                                             Double_t ptAssociatedMax,
+                                             Bool_t   normToTrig) {
   //Returns the 2D correlation function for (+-) pairs
   // Psi_2: axis 0
   fHistN->GetGrid(0)->GetGrid()->GetAxis(0)->SetRangeUser(psiMin,psiMax); 
@@ -1011,7 +1013,7 @@ TH2D *AliBalancePsi::GetCorrelationFunctionNP(Double_t psiMin,
 
   //Printf("Entries (1D): %lf",(Double_t)(fHistN->Project(0,2)->GetEntries()));
   //Printf("Entries (2D): %lf",(Double_t)(fHistNP->Project(0,2,3)->GetEntries()));
-  if((Double_t)(fHistN->Project(0,1)->GetEntries())!=0)
+  if(normToTrig && (Double_t)(fHistN->Project(0,1)->GetEntries())!=0)
     gHist->Scale(1./(Double_t)(fHistN->Project(0,1)->GetEntries()));
     
   return gHist;
@@ -1023,7 +1025,8 @@ TH2D *AliBalancePsi::GetCorrelationFunctionPP(Double_t psiMin,
                                              Double_t ptTriggerMin,
                                              Double_t ptTriggerMax,
                                              Double_t ptAssociatedMin,
-                                             Double_t ptAssociatedMax) {
+                                             Double_t ptAssociatedMax,
+                                             Bool_t   normToTrig) {
   //Returns the 2D correlation function for (+-) pairs
   // Psi_2: axis 0
   fHistP->GetGrid(0)->GetGrid()->GetAxis(0)->SetRangeUser(psiMin,psiMax); 
@@ -1048,7 +1051,7 @@ TH2D *AliBalancePsi::GetCorrelationFunctionPP(Double_t psiMin,
 
   //Printf("Entries (1D): %lf",(Double_t)(fHistP->Project(0,2)->GetEntries()));
   //Printf("Entries (2D): %lf",(Double_t)(fHistPP->Project(0,2,3)->GetEntries()));
-  if((Double_t)(fHistP->Project(0,1)->GetEntries())!=0)
+  if(normToTrig && (Double_t)(fHistP->Project(0,1)->GetEntries())!=0)
     gHist->Scale(1./(Double_t)(fHistP->Project(0,1)->GetEntries()));
   
   return gHist;
@@ -1060,7 +1063,8 @@ TH2D *AliBalancePsi::GetCorrelationFunctionNN(Double_t psiMin,
                                              Double_t ptTriggerMin,
                                              Double_t ptTriggerMax,
                                              Double_t ptAssociatedMin,
-                                             Double_t ptAssociatedMax) {
+                                             Double_t ptAssociatedMax,
+                                             Bool_t   normToTrig) {
   //Returns the 2D correlation function for (+-) pairs
   // Psi_2: axis 0
   fHistN->GetGrid(0)->GetGrid()->GetAxis(0)->SetRangeUser(psiMin,psiMax); 
@@ -1085,7 +1089,7 @@ TH2D *AliBalancePsi::GetCorrelationFunctionNN(Double_t psiMin,
 
   //Printf("Entries (1D): %lf",(Double_t)(fHistN->Project(0,2)->GetEntries()));
   //Printf("Entries (2D): %lf",(Double_t)(fHistNN->Project(0,2,3)->GetEntries()));
-  if((Double_t)(fHistN->Project(0,1)->GetEntries())!=0)
+  if(normToTrig && (Double_t)(fHistN->Project(0,1)->GetEntries())!=0)
     gHist->Scale(1./(Double_t)(fHistN->Project(0,1)->GetEntries()));
     
   return gHist;

diff --git a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
index 09943711c501cc5401fac4051ffea7ea656167d1..590fd2091a0fbe82054e465d1cb800b4bba0d03d 100644 (file)
--- a/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
+++ b/PWGCF/EBYE/BalanceFunctions/AliBalancePsi.h
@@ -71,22 +71,26 @@ class AliBalancePsi : public TObject {
                                   Double_t ptTriggerMin=-1.,
                                   Double_t ptTriggerMax=-1.,
                                   Double_t ptAssociatedMin=-1.,
-                                  Double_t ptAssociatedMax=-1);
+                                  Double_t ptAssociatedMax=-1,
+                                  Bool_t   normToTrig=kTRUE);
   TH2D   *GetCorrelationFunctionNP(Double_t psiMin, Double_t psiMax,
                                   Double_t ptTriggerMin=-1.,
                                   Double_t ptTriggerMax=-1.,
                                   Double_t ptAssociatedMin=-1.,
-                                  Double_t ptAssociatedMax=-1);
+                                  Double_t ptAssociatedMax=-1,
+                                  Bool_t   normToTrig=kTRUE);
   TH2D   *GetCorrelationFunctionPP(Double_t psiMin, Double_t psiMax,
                                   Double_t ptTriggerMin=-1.,
                                   Double_t ptTriggerMax=-1.,
                                   Double_t ptAssociatedMin=-1.,
-                                  Double_t ptAssociatedMax=-1);
+                                  Double_t ptAssociatedMax=-1,
+                                  Bool_t   normToTrig=kTRUE);
   TH2D   *GetCorrelationFunctionNN(Double_t psiMin, Double_t psiMax,
                                   Double_t ptTriggerMin=-1.,
                                   Double_t ptTriggerMax=-1.,
                                   Double_t ptAssociatedMin=-1.,
-                                  Double_t ptAssociatedMax=-1);
+                                  Double_t ptAssociatedMax=-1,
+                                  Bool_t   normToTrig=kTRUE);
 
   AliTHn *GetHistNp() {return fHistP;}
   AliTHn *GetHistNn() {return fHistN;}