extra control histogram

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.cxx b/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.cxx
index dca14e2cd37da4c2c4aa094d2fd90fc684dae16f..200f0aafd401ee855a92b745fba14c16104a01f4 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.cxx
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.cxx
@@ -45,6 +45,7 @@ AliFlowCommonHist::AliFlowCommonHist():
   TNamed(),
   fHistMultRP(NULL),
   fHistMultPOI(NULL),
+  fHistMultPOIvsRP(NULL),
   fHistPtRP(NULL),
   fHistPtPOI(NULL),
   fHistPtSub0(NULL),
@@ -77,6 +78,7 @@ AliFlowCommonHist::AliFlowCommonHist(const AliFlowCommonHist& a):
   TNamed(),
   fHistMultRP(new TH1F(*a.fHistMultRP)),
   fHistMultPOI(new TH1F(*a.fHistMultPOI)),
+  fHistMultPOIvsRP(new TH2F(*a.fHistMultPOIvsRP)),
   fHistPtRP(new TH1F(*a.fHistPtRP)),
   fHistPtPOI(new TH1F(*a.fHistPtPOI)),
   fHistPtSub0(new TH1F(*a.fHistPtSub0)),
@@ -104,7 +106,8 @@ AliFlowCommonHist::AliFlowCommonHist(const AliFlowCommonHist& a):
 
   fHistList = new TList();
   fHistList-> Add(fHistMultRP);        
-  fHistList-> Add(fHistMultPOI);       
+  fHistList-> Add(fHistMultPOI);
+  fHistList-> Add(fHistMultPOIvsRP);
   fHistList-> Add(fHistPtRP);          
   fHistList-> Add(fHistPtPOI);
   fHistList-> Add(fHistPtSub0);
@@ -137,6 +140,7 @@ AliFlowCommonHist::AliFlowCommonHist(const AliFlowCommonHist& a):
     TNamed(anInput,title),
     fHistMultRP(NULL),
     fHistMultPOI(NULL),
+    fHistMultPOIvsRP(NULL),
     fHistPtRP(NULL),
     fHistPtPOI(NULL),
     fHistPtSub0(NULL),
@@ -200,6 +204,12 @@ AliFlowCommonHist::AliFlowCommonHist(const AliFlowCommonHist& a):
   fHistMultPOI ->SetXTitle("Multiplicity for POI selection");
   fHistMultPOI ->SetYTitle("Counts");
 
+  sName = "Control_Flow_MultPOIvsRP_";
+  sName +=anInput;
+  fHistMultPOIvsRP = new TH2F(sName.Data(), sName.Data(),iNbinsMult, dMultMin, dMultMax,iNbinsMult, dMultMin, dMultMax);
+  fHistMultPOIvsRP->SetXTitle("Multiplicity for RP selection");
+  fHistMultPOIvsRP->SetYTitle("Multiplicity for POI selection");
+
   //Pt
   sName = "Control_Flow_PtRP_";
   sName +=anInput;
@@ -338,7 +348,8 @@ AliFlowCommonHist::AliFlowCommonHist(const AliFlowCommonHist& a):
   //list of histograms if added here also add in copy constructor
   fHistList = new TList();
   fHistList-> Add(fHistMultRP);        
-  fHistList-> Add(fHistMultPOI);       
+  fHistList-> Add(fHistMultPOI); 
+  fHistList-> Add(fHistMultPOIvsRP);
   fHistList-> Add(fHistPtRP);          
   fHistList-> Add(fHistPtPOI); 
   fHistList-> Add(fHistPtSub0);
@@ -370,7 +381,8 @@ AliFlowCommonHist::~AliFlowCommonHist()
 {
   //deletes histograms
   delete fHistMultRP;       
-  delete fHistMultPOI;      
+  delete fHistMultPOI; 
+  delete fHistMultPOIvsRP;
   delete fHistPtRP;         
   delete fHistPtPOI;
   delete fHistPtSub0;
@@ -489,6 +501,7 @@ Bool_t AliFlowCommonHist::FillControlHistograms(AliFlowEventSimple* anEvent)
   
   fHistMultRP->Fill(dMultRP);
   fHistMultPOI->Fill(dMultPOI);
+  fHistMultPOIvsRP->Fill(dMultRP,dMultPOI);
   
   //<reference multiplicity> versus # of RPs:
   fRefMultVsNoOfRPs->Fill(dMultRP+0.5,anEvent->GetReferenceMultiplicity(),1.);

diff --git a/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h b/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h
index 56f797f6de2d2c0f6222cd9a7798e540de99437c..e1cc3c5649fc6fcaff8ff8d08faf77a2aaae060e 100644 (file)
--- a/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h
+++ b/PWG2/FLOW/AliFlowCommon/AliFlowCommonHist.h
@@ -42,7 +42,8 @@ class AliFlowCommonHist: public TNamed {
   Double_t GetMeanPt(Int_t iBin);             //gets the mean pt for this bin from fHistProMeanPtperBin   
 
   TH1F*     GetHistMultRP()          {return fHistMultRP; } ;  
-  TH1F*     GetHistMultPOI()         {return fHistMultPOI; } ;  
+  TH1F*     GetHistMultPOI()         {return fHistMultPOI; } ; 
+  TH2F*     GetHistMultPOIvsRP()     {return fHistMultPOIvsRP; } ;
   TH1F*     GetHistPtRP()            {return fHistPtRP; } ;  
   TH1F*     GetHistPtPOI()           {return fHistPtPOI; } ;
   TH1F*     GetHistPtSub0()          {return fHistPtSub0; } ;
@@ -77,33 +78,34 @@ class AliFlowCommonHist: public TNamed {
 
   //define histograms here
   //control histograms
-  TH1F*     fHistMultRP;          //multiplicity for RP selection
-  TH1F*     fHistMultPOI;         //multiplicity for POI selection
-  TH1F*     fHistPtRP;            //pt distribution for RP selection
-  TH1F*     fHistPtPOI;           //pt distribution for POI selection
-  TH1F*     fHistPtSub0;          //pt distribution for subevent 0
-  TH1F*     fHistPtSub1;          //pt distribution for subevent 1
-  TH1F*     fHistPhiRP;           //phi distribution for RP selection
-  TH1F*     fHistPhiPOI;          //phi distribution for POI selection
-  TH1F*     fHistPhiSub0;         //phi distribution for subevent 0
-  TH1F*     fHistPhiSub1;         //phi distribution for subevent 1
-  TH1F*     fHistEtaRP;           //eta distribution for RP selection
-  TH1F*     fHistEtaPOI;          //eta distribution for POI selection
-  TH1F*     fHistEtaSub0;         //eta distribution for subevent 0
-  TH1F*     fHistEtaSub1;         //eta distribution for subevent 1
-  TH2F*     fHistPhiEtaRP;        //eta vs phi for RP selection
-  TH2F*     fHistPhiEtaPOI;       //eta vs phi for POI selection
-  TProfile* fHistProMeanPtperBin; //mean pt for each pt bin (for POI selection)
-  TH1F*     fHistQ;               //Qvector distribution
-  TH1F*     fHistAngleQ;          //distribution of angle of Q vector
-  TH1F*     fHistAngleQSub0;      //distribution of angle of subevent 0 Q vector
-  TH1F*     fHistAngleQSub1;      //distribution of angle of subevent 1 Q vector
-  TProfile* fHarmonic;            //harmonic 
-  TProfile* fRefMultVsNoOfRPs;    //<reference multiplicity> versus # of RPs
-
-  TList*    fHistList;            //list to hold all histograms  
-
-  ClassDef(AliFlowCommonHist,2)  // macro for rootcint
+  TH1F*     fHistMultRP;          // multiplicity for RP selection
+  TH1F*     fHistMultPOI;         // multiplicity for POI selection
+  TH2F*     fHistMultPOIvsRP;     // multiplicity for POI versus RP
+  TH1F*     fHistPtRP;            // pt distribution for RP selection
+  TH1F*     fHistPtPOI;           // pt distribution for POI selection
+  TH1F*     fHistPtSub0;          // pt distribution for subevent 0
+  TH1F*     fHistPtSub1;          // pt distribution for subevent 1
+  TH1F*     fHistPhiRP;           // phi distribution for RP selection
+  TH1F*     fHistPhiPOI;          // phi distribution for POI selection
+  TH1F*     fHistPhiSub0;         // phi distribution for subevent 0
+  TH1F*     fHistPhiSub1;         // phi distribution for subevent 1
+  TH1F*     fHistEtaRP;           // eta distribution for RP selection
+  TH1F*     fHistEtaPOI;          // eta distribution for POI selection
+  TH1F*     fHistEtaSub0;         // eta distribution for subevent 0
+  TH1F*     fHistEtaSub1;         // eta distribution for subevent 1
+  TH2F*     fHistPhiEtaRP;        // eta vs phi for RP selection
+  TH2F*     fHistPhiEtaPOI;       // eta vs phi for POI selection
+  TProfile* fHistProMeanPtperBin; // mean pt for each pt bin (for POI selection)
+  TH1F*     fHistQ;               // Qvector distribution
+  TH1F*     fHistAngleQ;          // distribution of angle of Q vector
+  TH1F*     fHistAngleQSub0;      // distribution of angle of subevent 0 Q vector
+  TH1F*     fHistAngleQSub1;      // distribution of angle of subevent 1 Q vector
+  TProfile* fHarmonic;            // harmonic 
+  TProfile* fRefMultVsNoOfRPs;    // <reference multiplicity> versus # of RPs
+
+  TList*    fHistList;            // list to hold all histograms  
+
+  ClassDef(AliFlowCommonHist,2)   // macro for rootcint
 };
 #endif
 

diff --git a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx
index 061776aaac4f0685f3853efe0e8ef5a4afb95baf..c61d30772b6ece241638d8139234315105f7cf32 100644 (file)
--- a/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx
+++ b/PWG2/FLOW/AliFlowTasks/AliAnalysisTaskScalarProduct.cxx
@@ -105,18 +105,11 @@ void AliAnalysisTaskScalarProduct::UserCreateOutputObjects()
 
   //set the allowed relative difference in the subevent multiplicities
   fSP->SetRelDiffMsub(fRelDiffMsub); 
-  
-  cout<<endl;
-  cout<<endl;
-  cout<<endl;
-  cout<<endl;
-  cout<<"TASK SP: "<<fApplyCorrectionForNUA<<endl;
-  cout<<endl;
-  cout<<endl;
-  cout<<endl;
-  cout<<endl;
-  
+    
   //apply automatic correction for non-uniform acceptance:
+  if (fApplyCorrectionForNUA) {
+    cout<<"Corrections for non-uniform acceptance applied in the Scalar Product method"<<endl;
+  }
   fSP->SetApplyCorrectionForNUA(fApplyCorrectionForNUA);
     
   //for using phi weights: