fixing coding viol
authorsnelling <snelling@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 16 Nov 2009 15:11:25 +0000 (15:11 +0000)
committersnelling <snelling@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 16 Nov 2009 15:11:25 +0000 (15:11 +0000)
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.cxx
PWG2/FLOW/AliFlowCommon/AliFlowAnalysisWithQCumulants.h
PWG2/FLOW/AliFlowCommon/AliFlowCumuConstants.h

index ed3e126..f4d9993 100644 (file)
@@ -1285,7 +1285,7 @@ void AliFlowAnalysisWithQCumulants::BookAndFillWeightsHistograms()
   if(fWeightsList->FindObject("phi_weights"))
   {
    fPhiWeights = dynamic_cast<TH1F*>(fWeightsList->FindObject("phi_weights"));
-   if(fPhiWeights->GetBinWidth(1) != fPhiBinWidth)
+   if((fPhiWeights->GetBinWidth(1) > fPhiBinWidth) || (fPhiWeights->GetBinWidth(1) < fPhiBinWidth))
    {
     cout<<"WARNING: fPhiWeights->GetBinWidth(1) != fPhiBinWidth in AFAWQC::BAFWH() !!!!        "<<endl;
     cout<<"         This indicates inconsistent binning in phi histograms throughout the code."<<endl;
@@ -1303,7 +1303,7 @@ void AliFlowAnalysisWithQCumulants::BookAndFillWeightsHistograms()
   if(fWeightsList->FindObject("pt_weights"))
   {
    fPtWeights = dynamic_cast<TH1D*>(fWeightsList->FindObject("pt_weights"));
-   if(fPtWeights->GetBinWidth(1) != fPtBinWidth)
+   if((fPtWeights->GetBinWidth(1) > fPtBinWidth) || (fPtWeights->GetBinWidth(1) < fPtBinWidth))
    {
     cout<<"WARNING: fPtWeights->GetBinWidth(1) != fPtBinWidth in AFAWQC::BAFWH() !!!!         "<<endl;
     cout<<"         This indicates insconsistent binning in pt histograms throughout the code."<<endl;
@@ -1321,7 +1321,7 @@ void AliFlowAnalysisWithQCumulants::BookAndFillWeightsHistograms()
   if(fWeightsList->FindObject("eta_weights"))
   {
    fEtaWeights = dynamic_cast<TH1D*>(fWeightsList->FindObject("eta_weights"));
-   if(fEtaWeights->GetBinWidth(1) != fEtaBinWidth)
+   if((fEtaWeights->GetBinWidth(1) > fEtaBinWidth) || (fEtaWeights->GetBinWidth(1) < fEtaBinWidth))
    {
     cout<<"WARNING: fEtaWeights->GetBinWidth(1) != fEtaBinWidth in AFAWQC::BAFWH() !!!!        "<<endl;
     cout<<"         This indicates insconsistent binning in eta histograms throughout the code."<<endl;
@@ -2833,7 +2833,7 @@ void AliFlowAnalysisWithQCumulants::CalculateIntFlow()
  Double_t v8ErrorSquared = 0.; // squared statistical error of v{8,QC} 
  
  // calculate squared statistical errors of integrated flow estimates:
- if(two != 0.) 
+ if(two > 0.) 
  { 
   v2ErrorSquared = (1./(4.*two))*pow(twoError,2.);
  } 
@@ -5476,7 +5476,7 @@ void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCovariances(TString type, T
   {
    denominator = 1.-term1/(term2*term3);
    prefactor = term1/(term2*term3);
-   if(denominator!=0.)
+   if(denominator!=0)
    {
     covTwoTwoReduced = (twoTwoReduced-two*twoReduced)/denominator;            
     wCovTwoTwoReduced = covTwoTwoReduced*prefactor; 
@@ -5491,7 +5491,7 @@ void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCovariances(TString type, T
   {
    denominator = 1.-term1/(term2*term3);
    prefactor = term1/(term2*term3);
-   if(denominator!=0.)
+   if(denominator!=0)
    {
     covTwoFourReduced = (twoFourReduced-two*fourReduced)/denominator;            
     wCovTwoFourReduced = covTwoFourReduced*prefactor; 
@@ -5506,7 +5506,7 @@ void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCovariances(TString type, T
   {
    denominator = 1.-term1/(term2*term3);
    prefactor = term1/(term2*term3);
-   if(denominator!=0.)
+   if(denominator!=0)
    {
     covFourTwoReduced = (fourTwoReduced-four*twoReduced)/denominator;            
     wCovFourTwoReduced = covFourTwoReduced*prefactor; 
@@ -5521,7 +5521,7 @@ void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCovariances(TString type, T
   {
    denominator = 1.-term1/(term2*term3);
    prefactor = term1/(term2*term3);
-   if(denominator!=0.)
+   if(denominator!=0)
    {
     covFourFourReduced = (fourFourReduced-four*fourReduced)/denominator;            
     wCovFourFourReduced = covFourFourReduced*prefactor; 
@@ -5536,7 +5536,7 @@ void AliFlowAnalysisWithQCumulants::CalculateDiffFlowCovariances(TString type, T
   {
    denominator = 1.-term1/(term2*term3);
    prefactor = term1/(term2*term3);
-   if(denominator!=0.)
+   if(denominator!=0)
    {
     covTwoReducedFourReduced = (twoReducedFourReduced-twoReduced*fourReduced)/denominator;            
     wCovTwoReducedFourReduced = covTwoReducedFourReduced*prefactor; 
@@ -9007,8 +9007,8 @@ void AliFlowAnalysisWithQCumulants::CrossCheckDiffFlowCorrelations(TString type,
  Int_t t = typeFlag;
  Int_t pe = ptEtaFlag;
       
- TString RPorPOIString[2] = {"RP ","POI"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
- TString PtOrEtaString[2] = {"pt","eta"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
+ TString rpORpoiString[2] = {"RP ","POI"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
+ TString ptORetaString[2] = {"pt","eta"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
  TString reducedCorrelations[4] = {"<<cos(n(psi1-phi2))>>","<<cos(n(psi1+phi2-phi3-phi4))>>","",""}; // to be improved (access this from pro or hist)
  Double_t lowerPtEtaEdge[2] = {fPtMin+(fCrossCheckInPtBinNo-1)*fPtBinWidth,fEtaMin+(fCrossCheckInEtaBinNo-1)*fEtaBinWidth};
  Double_t upperPtEtaEdge[2] = {fPtMin+fCrossCheckInPtBinNo*fPtBinWidth,fEtaMin+fCrossCheckInEtaBinNo*fEtaBinWidth};
@@ -9020,10 +9020,10 @@ void AliFlowAnalysisWithQCumulants::CrossCheckDiffFlowCorrelations(TString type,
  cout<<"   *****************************************"<<endl;
  cout<<"   **** cross-checking the correlations ****"<<endl;
  cout<<"   ****      for differential flow      ****"<<endl;
- cout<<"   ****               "<<RPorPOIString[t]<<"               ****"<<endl;
+ cout<<"   ****               "<<rpORpoiString[t]<<"               ****"<<endl;
  cout<<"   *****************************************"<<endl; 
  cout<<endl;
- cout<<"           "<<PtOrEtaString[pe]<<" bin: "<<lowerPtEtaEdge[pe]<<" <= "<<PtOrEtaString[pe]<<" < "<<upperPtEtaEdge[pe]<<endl;
+ cout<<"           "<<ptORetaString[pe]<<" bin: "<<lowerPtEtaEdge[pe]<<" <= "<<ptORetaString[pe]<<" < "<<upperPtEtaEdge[pe]<<endl;
  cout<<endl;
  
  for(Int_t rci=0;rci<2;rci++) // to be improved (calculate 6th and 8th order)
@@ -9320,8 +9320,8 @@ void AliFlowAnalysisWithQCumulants::CrossCheckDiffFlowCorrectionTermsForNUA(TStr
  Int_t t = typeFlag;
  Int_t pe = ptEtaFlag;
       
- TString RPorPOIString[2] = {"RP ","POI"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
- TString PtOrEtaString[2] = {"pt","eta"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
+ TString rpORpoiString[2] = {"RP ","POI"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
+ TString ptORetaString[2] = {"pt","eta"}; // to be improved (name in the same way as in the other methods, eventually promote to data member) 
  //TString sinCosFlag[2] = {"sin","cos"}; // to be improved (eventually promote to data member)
  TString reducedCorrectionSinTerms[4] = {"<<sin(n(psi1))>>","<<sin(n(psi1+phi2))>>","<<sin(n*(psi1+phi2-phi3))>>","<<sin(n*(psi1-phi2-phi3))>>"}; // to be improved (access this from pro or hist)
  TString reducedCorrectionCosTerms[4] = {"<<cos(n(psi1))>>","<<cos(n(psi1+phi2))>>","<<cos(n*(psi1+phi2-phi3))>>","<<cos(n*(psi1-phi2-phi3))>>"}; // to be improved (access this from pro or hist)
@@ -9335,10 +9335,10 @@ void AliFlowAnalysisWithQCumulants::CrossCheckDiffFlowCorrectionTermsForNUA(TStr
  cout<<"   ****  cross-checking the correction   ****"<<endl;
  cout<<"   **** terms for non-uniform acceptance ****"<<endl;
  cout<<"   ****      for differential flow       ****"<<endl;
- cout<<"   ****              "<<RPorPOIString[t]<<"                 ****"<<endl;
+ cout<<"   ****              "<<rpORpoiString[t]<<"                 ****"<<endl;
  cout<<"   ******************************************"<<endl; 
  cout<<endl;
- cout<<"           "<<PtOrEtaString[pe]<<" bin: "<<lowerPtEtaEdge[pe]<<" <= "<<PtOrEtaString[pe]<<" < "<<upperPtEtaEdge[pe]<<endl;
+ cout<<"           "<<ptORetaString[pe]<<" bin: "<<lowerPtEtaEdge[pe]<<" <= "<<ptORetaString[pe]<<" < "<<upperPtEtaEdge[pe]<<endl;
  cout<<endl;
  
  for(Int_t cti=0;cti<4;cti++) // correction term index
index b525f6f..9dc92a9 100644 (file)
@@ -74,9 +74,9 @@ class AliFlowAnalysisWithQCumulants{
     // ...  
     virtual void CalculateIntFlowCorrelationsUsingParticleWeights();
     virtual void CalculateWeightedQProductsForIntFlow();
-    virtual void EvaluateIntFlowCorrelationsWithNestedLoops(AliFlowEventSimple* anEvent); 
-    virtual void EvaluateIntFlowCorrelationsWithNestedLoopsUsingParticleWeights(AliFlowEventSimple* anEvent); 
-    virtual void EvaluateIntFlowCorrectionsForNUAWithNestedLoops(AliFlowEventSimple* anEvent);  
+    virtual void EvaluateIntFlowCorrelationsWithNestedLoops(AliFlowEventSimple* const anEvent); 
+    virtual void EvaluateIntFlowCorrelationsWithNestedLoopsUsingParticleWeights(AliFlowEventSimple* const anEvent); 
+    virtual void EvaluateIntFlowCorrectionsForNUAWithNestedLoops(AliFlowEventSimple* const anEvent);  
     // 2c.) differential flow:
     virtual void CalculateDiffFlowCorrelations(TString type, TString ptOrEta); // type = RP or POI
     virtual void CalculateDiffFlowCorrelationsUsingParticleWeights(TString type, TString ptOrEta); // type = RP or POI 
@@ -89,9 +89,9 @@ class AliFlowAnalysisWithQCumulants{
     //virtual void CalculateCorrelationsForDifferentialFlow2D(TString type); // type = RP or POI
     //virtual void CalculateCorrectionsForNonUniformAcceptanceForDifferentialFlowCosTerms(TString type); // type = RP or POI  
     //virtual void CalculateCorrectionsForNonUniformAcceptanceForDifferentialFlowSinTerms(TString type); // type = RP or POI
-    virtual void EvaluateDiffFlowCorrelationsWithNestedLoops(AliFlowEventSimple* anEvent, TString type, TString ptOrEta);
-    virtual void EvaluateDiffFlowCorrelationsWithNestedLoopsUsingParticleWeights(AliFlowEventSimple* anEvent, TString type, TString ptOrEta); 
-    virtual void EvaluateDiffFlowCorrectionTermsForNUAWithNestedLoops(AliFlowEventSimple* anEvent, TString type, TString ptOrEta);
+    virtual void EvaluateDiffFlowCorrelationsWithNestedLoops(AliFlowEventSimple* const anEvent, TString type, TString ptOrEta);
+    virtual void EvaluateDiffFlowCorrelationsWithNestedLoopsUsingParticleWeights(AliFlowEventSimple* const anEvent, TString type, TString ptOrEta); 
+    virtual void EvaluateDiffFlowCorrectionTermsForNUAWithNestedLoops(AliFlowEventSimple* const anEvent, TString type, TString ptOrEta);
   // 3.) method Finish() and methods called within Finish():
   virtual void Finish();
     // 3a.) integrated flow:
@@ -170,7 +170,7 @@ class AliFlowAnalysisWithQCumulants{
   TString *GetAnalysisLabel() const {return this->fAnalysisLabel;};
   
   // 2.) particle weights:
-  void SetWeightsList(TList* wlist) {this->fWeightsList = (TList*)wlist->Clone();}
+  void SetWeightsList(TList* const wlist) {this->fWeightsList = (TList*)wlist->Clone();}
   TList* GetWeightsList() const {return this->fWeightsList;}  
   void SetUsePhiWeights(Bool_t const uPhiW) {this->fUsePhiWeights = uPhiW;};
   Bool_t GetUsePhiWeights() const {return this->fUsePhiWeights;};
@@ -204,7 +204,7 @@ class AliFlowAnalysisWithQCumulants{
   TProfile* GetIntFlowExtraCorrelationsPro() const {return this->fIntFlowExtraCorrelationsPro;};  
   void SetIntFlowProductOfCorrelationsPro(TProfile* const intFlowProductOfCorrelationsPro) {this->fIntFlowProductOfCorrelationsPro = intFlowProductOfCorrelationsPro;};
   TProfile* GetIntFlowProductOfCorrelationsPro() const {return this->fIntFlowProductOfCorrelationsPro;};  
-  void SetIntFlowCorrectionTermsForNUAPro(TProfile* const ifctfnp, Int_t sc) {this->fIntFlowCorrectionTermsForNUAPro[sc] = ifctfnp;};
+  void SetIntFlowCorrectionTermsForNUAPro(TProfile* const ifctfnp, Int_t const sc) {this->fIntFlowCorrectionTermsForNUAPro[sc] = ifctfnp;};
   TProfile* GetIntFlowCorrectionTermsForNUAPro(Int_t sc) const {return this->fIntFlowCorrectionTermsForNUAPro[sc];};  
   // integrated flow histograms holding all results:
   void SetIntFlowCorrelationsHist(TH1D* const intFlowCorrelationsHist) {this->fIntFlowCorrelationsHist = intFlowCorrelationsHist;};
@@ -214,11 +214,11 @@ class AliFlowAnalysisWithQCumulants{
   // to be improved (removed:)
   //void SetIntFlowProductOfCorrelationsHist(TH1D* const intFlowProductOfCorrelationsHist) {this->fIntFlowProductOfCorrelationsHist = intFlowProductOfCorrelationsHist;};
   //TH1D* GetIntFlowProductOfCorrelationsHist() const {return this->fIntFlowProductOfCorrelationsHist;};  
-  void SetIntFlowCorrectionTermsForNUAHist(TH1D* const ifctfnh, Int_t sc) {this->fIntFlowCorrectionTermsForNUAHist[sc] = ifctfnh;};
+  void SetIntFlowCorrectionTermsForNUAHist(TH1D* const ifctfnh, Int_t const sc) {this->fIntFlowCorrectionTermsForNUAHist[sc] = ifctfnh;};
   TH1D* GetIntFlowCorrectionTermsForNUAHist(Int_t sc) const {return this->fIntFlowCorrectionTermsForNUAHist[sc];};  
   void SetIntFlowCovariances(TH1D* const intFlowCovariances) {this->fIntFlowCovariances = intFlowCovariances;};
   TH1D* GetIntFlowCovariances() const {return this->fIntFlowCovariances;};
-  void SetIntFlowSumOfEventWeights(TH1D* const intFlowSumOfEventWeights, Int_t power) {this->fIntFlowSumOfEventWeights[power] = intFlowSumOfEventWeights;};
+  void SetIntFlowSumOfEventWeights(TH1D* const intFlowSumOfEventWeights, Int_t const power) {this->fIntFlowSumOfEventWeights[power] = intFlowSumOfEventWeights;};
   TH1D* GetIntFlowSumOfEventWeights(Int_t power) const {return this->fIntFlowSumOfEventWeights[power];};
   void SetIntFlowSumOfProductOfEventWeights(TH1D* const intFlowSumOfProductOfEventWeights) {this->fIntFlowSumOfProductOfEventWeights = intFlowSumOfProductOfEventWeights;};
   TH1D* GetIntFlowSumOfProductOfEventWeights() const {return this->fIntFlowSumOfProductOfEventWeights;}; 
@@ -235,37 +235,37 @@ class AliFlowAnalysisWithQCumulants{
   Bool_t GetCalculate2DFlow() const {return this->fCalculate2DFlow;};
   // profiles:
   // 1D:
-  void SetDiffFlowCorrelationsPro(TProfile* const diffFlowCorrelationsPro, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCorrelationsPro[i][j][k] = diffFlowCorrelationsPro;};
+  void SetDiffFlowCorrelationsPro(TProfile* const diffFlowCorrelationsPro, Int_t const i, Int_t const j, Int_t const k) {this->fDiffFlowCorrelationsPro[i][j][k] = diffFlowCorrelationsPro;};
   TProfile* GetDiffFlowCorrelationsPro(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCorrelationsPro[i][j][k];};
-  void SetDiffFlowProductOfCorrelationsPro(TProfile* const dfpocp, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowProductOfCorrelationsPro[i][j][k][l] = dfpocp;};
+  void SetDiffFlowProductOfCorrelationsPro(TProfile* const dfpocp, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fDiffFlowProductOfCorrelationsPro[i][j][k][l] = dfpocp;};
   TProfile* GetDiffFlowProductOfCorrelationsPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowProductOfCorrelationsPro[i][j][k][l];};
-  void SetDiffFlowCorrectionTermsForNUAPro(TProfile* const dfctfnp, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowCorrectionTermsForNUAPro[i][j][k][l] = dfctfnp;};
+  void SetDiffFlowCorrectionTermsForNUAPro(TProfile* const dfctfnp, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fDiffFlowCorrectionTermsForNUAPro[i][j][k][l] = dfctfnp;};
   TProfile* GetDiffFlowCorrectionTermsForNUAPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowCorrectionTermsForNUAPro[i][j][k][l];};  
   // 2D:
-  void SetCorrelationsPro(TProfile2D* const correlPro, Int_t i, Int_t j, Int_t k, Int_t l) {this->fCorrelationsPro[i][j][k][l] = correlPro;};
+  void SetCorrelationsPro(TProfile2D* const correlPro, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fCorrelationsPro[i][j][k][l] = correlPro;};
   TProfile2D* GetCorrelationsPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fCorrelationsPro[i][j][k][l];};
-  void SetProductsOfCorrelationsPro(TProfile2D* const proOfcorrelPro, Int_t i, Int_t j, Int_t k, Int_t l) {this->fProductsOfCorrelationsPro[i][j][k][l] = proOfcorrelPro;};
+  void SetProductsOfCorrelationsPro(TProfile2D* const proOfcorrelPro, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fProductsOfCorrelationsPro[i][j][k][l] = proOfcorrelPro;};
   TProfile2D* GetProductsOfCorrelationsPro(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fProductsOfCorrelationsPro[i][j][k][l];};
-  void SetCorrectionTermsPro(TProfile2D* const correctTermsPro, Int_t i, Int_t j, Int_t k, Int_t l, Int_t m) {this->fCorrectionTermsPro[i][j][k][l][m] = correctTermsPro;};
+  void SetCorrectionTermsPro(TProfile2D* const correctTermsPro, Int_t const i, Int_t const j, Int_t const k, Int_t const l, Int_t const m) {this->fCorrectionTermsPro[i][j][k][l][m] = correctTermsPro;};
   TProfile2D* GetCorrectionTermsPro(Int_t i, Int_t j, Int_t k, Int_t l, Int_t m) const {return this->fCorrectionTermsPro[i][j][k][l][m];};  
   // histograms:
-  void SetDiffFlowCorrelationsHist(TH1D* const diffFlowCorrelationsHist, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCorrelationsHist[i][j][k] = diffFlowCorrelationsHist;};
+  void SetDiffFlowCorrelationsHist(TH1D* const diffFlowCorrelationsHist, Int_t const i, Int_t const j, Int_t const k) {this->fDiffFlowCorrelationsHist[i][j][k] = diffFlowCorrelationsHist;};
   TH1D* GetDiffFlowCorrelationsHist(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCorrelationsHist[i][j][k];};
-  void SetDiffFlowCovariances(TH1D* const diffFlowCovariances, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCovariances[i][j][k] = diffFlowCovariances;};
+  void SetDiffFlowCovariances(TH1D* const diffFlowCovariances, Int_t const i, Int_t const j, Int_t const k) {this->fDiffFlowCovariances[i][j][k] = diffFlowCovariances;};
   TH1D* GetDiffFlowCovariances(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCovariances[i][j][k];};  
-  void SetDiffFlowCumulants(TH1D* const diffFlowCumulants, Int_t i, Int_t j, Int_t k) {this->fDiffFlowCumulants[i][j][k] = diffFlowCumulants;};
+  void SetDiffFlowCumulants(TH1D* const diffFlowCumulants, Int_t const i, Int_t const j, Int_t const k) {this->fDiffFlowCumulants[i][j][k] = diffFlowCumulants;};
   TH1D* GetDiffFlowCumulants(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowCumulants[i][j][k];};
-  void SetDiffFlow(TH1D* const diffFlow, Int_t i, Int_t j, Int_t k) {this->fDiffFlow[i][j][k] = diffFlow;};
+  void SetDiffFlow(TH1D* const diffFlow, Int_t const i, Int_t const j, Int_t const k) {this->fDiffFlow[i][j][k] = diffFlow;};
   TH1D* GetDiffFlow(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlow[i][j][k];};
-  void SetDiffFlowSumOfEventWeights(TH1D* const dfsoew, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowSumOfEventWeights[i][j][k][l] = dfsoew;};
+  void SetDiffFlowSumOfEventWeights(TH1D* const dfsoew, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fDiffFlowSumOfEventWeights[i][j][k][l] = dfsoew;};
   TH1D* GetDiffFlowSumOfEventWeights(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowSumOfEventWeights[i][j][k][l];};
-  void SetDiffFlowSumOfProductOfEventWeights(TH1D* const dfsopoew, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowSumOfProductOfEventWeights[i][j][k][l] = dfsopoew;};
+  void SetDiffFlowSumOfProductOfEventWeights(TH1D* const dfsopoew, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fDiffFlowSumOfProductOfEventWeights[i][j][k][l] = dfsopoew;};
   TH1D* GetDiffFlowSumOfProductOfEventWeights(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowSumOfProductOfEventWeights[i][j][k][l];};
-  void SetDiffFlowCorrectionTermsForNUAHist(TH1D* const dfctfnh, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowCorrectionTermsForNUAHist[i][j][k][l] = dfctfnh;};
+  void SetDiffFlowCorrectionTermsForNUAHist(TH1D* const dfctfnh, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fDiffFlowCorrectionTermsForNUAHist[i][j][k][l] = dfctfnh;};
   TH1D* GetDiffFlowCorrectionTermsForNUAHist(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowCorrectionTermsForNUAHist[i][j][k][l];};  
   
   // x.) debugging and cross-checking:
-  void SetNestedLoopsList(TList* nllist) {this->fNestedLoopsList = nllist;};
+  void SetNestedLoopsList(TList* const nllist) {this->fNestedLoopsList = nllist;};
   TList* GetNestedLoopsList() const {return this->fNestedLoopsList;}; 
   void SetEvaluateIntFlowNestedLoops(Bool_t const eifnl) {this->fEvaluateIntFlowNestedLoops = eifnl;};
   Bool_t GetEvaluateIntFlowNestedLoops() const {return this->fEvaluateIntFlowNestedLoops;};
@@ -279,15 +279,15 @@ class AliFlowAnalysisWithQCumulants{
   TProfile* GetIntFlowDirectCorrelations() const {return this->fIntFlowDirectCorrelations;};
   void SetIntFlowExtraDirectCorrelations(TProfile* const ifedc) {this->fIntFlowExtraDirectCorrelations = ifedc;};
   TProfile* GetIntFlowExtraDirectCorrelations() const {return this->fIntFlowExtraDirectCorrelations;};
-  void SetIntFlowDirectCorrectionTermsForNUA(TProfile* const ifdctfn, Int_t sc) {this->fIntFlowDirectCorrectionTermsForNUA[sc] = ifdctfn;};
+  void SetIntFlowDirectCorrectionTermsForNUA(TProfile* const ifdctfn, Int_t const sc) {this->fIntFlowDirectCorrectionTermsForNUA[sc] = ifdctfn;};
   TProfile* GetIntFlowDirectCorrectionTermsForNUA(Int_t sc) const {return this->fIntFlowDirectCorrectionTermsForNUA[sc];};  
   void SetCrossCheckInPtBinNo(Int_t const crossCheckInPtBinNo) {this->fCrossCheckInPtBinNo = crossCheckInPtBinNo;};
   Int_t GetCrossCheckInPtBinNo() const {return this->fCrossCheckInPtBinNo;};
   void SetCrossCheckInEtaBinNo(Int_t const crossCheckInEtaBinNo) {this->fCrossCheckInEtaBinNo = crossCheckInEtaBinNo;};
   Int_t GetCrossCheckInEtaBinNo() const {return this->fCrossCheckInEtaBinNo;};
-  void SetDiffFlowDirectCorrelations(TProfile* const diffFlowDirectCorrelations,Int_t i,Int_t j,Int_t k){this->fDiffFlowDirectCorrelations[i][j][k]=diffFlowDirectCorrelations;};
+  void SetDiffFlowDirectCorrelations(TProfile* const diffFlowDirectCorrelations,Int_t const i,Int_t const j,Int_t const k){this->fDiffFlowDirectCorrelations[i][j][k]=diffFlowDirectCorrelations;};
   TProfile* GetDiffFlowDirectCorrelations(Int_t i, Int_t j, Int_t k) const {return this->fDiffFlowDirectCorrelations[i][j][k];};
-  void SetDiffFlowDirectCorrectionTermsForNUA(TProfile* const dfdctfn, Int_t i, Int_t j, Int_t k, Int_t l) {this->fDiffFlowDirectCorrectionTermsForNUA[i][j][k][l] = dfdctfn;};
+  void SetDiffFlowDirectCorrectionTermsForNUA(TProfile* const dfdctfn, Int_t const i, Int_t const j, Int_t const k, Int_t const l) {this->fDiffFlowDirectCorrectionTermsForNUA[i][j][k][l] = dfdctfn;};
   TProfile* GetDiffFlowDirectCorrectionTermsForNUA(Int_t i, Int_t j, Int_t k, Int_t l) const {return this->fDiffFlowDirectCorrectionTermsForNUA[i][j][k][l];};  
         
  private:
index 982b03f..63c110f 100644 (file)
@@ -22,41 +22,41 @@ public:
   static AliFlowCumuConstants* GetMaster();
 
   //static consts for compatibility only!
-  static const Int_t fgkQmax = 11; //
-  static const Int_t fgkPmax = 5; //
-  static const Int_t fgkQmax4 = 5; //
-  static const Int_t fgkPmax4 = 2; //
-  static const Int_t fgkQmax6 = 7; //
-  static const Int_t fgkPmax6 = 3; //
-  static const Int_t fgkQmax8 = 9; //
-  static const Int_t fgkPmax8 = 4; //
-  static const Int_t fgkQmax16 = 17; //
-  static const Int_t fgkPmax16 = 8; //
-  static const Int_t fgkFlow = 2; //
-  static const Int_t fgkMltpl = 1; //
+  static const Int_t fgkQmax = 11; // Qmax 
+  static const Int_t fgkPmax = 5; // Pmax 
+  static const Int_t fgkQmax4 = 5; // Qmax4
+  static const Int_t fgkPmax4 = 2; // Pmax4
+  static const Int_t fgkQmax6 = 7; // Qmax6
+  static const Int_t fgkPmax6 = 3; // Pmax6
+  static const Int_t fgkQmax8 = 9; // Qmax8
+  static const Int_t fgkPmax8 = 4; // Pmax8
+  static const Int_t fgkQmax16 = 17; // Qmax16
+  static const Int_t fgkPmax16 = 8; // Pmax16
+  static const Int_t fgkFlow = 2; // flow estimate
+  static const Int_t fgkMltpl = 1; // multiple
   //static const Double_t  fgkBinWidth = 0.1; //
   //static const Double_t  fgkR0 = 2.2; //
   //static const Double_t  fgkPtMax = 3.1; //
   //static const Double_t  fgkPtMin = 0.0; //
   //static const Bool_t  fgkOtherEquations = kFALSE; //
   
-  Int_t GetQmax() {return fQmax;}
-  Int_t GetPmax() {return fPmax;}
-  Int_t GetQmax4() {return fQmax4;}
-  Int_t GetPmax4() {return fPmax4;}
-  Int_t GetQmax6() {return fQmax6;}
-  Int_t GetPmax6() {return fPmax6;}
-  Int_t GetQmax8() {return fQmax8;}
-  Int_t GetPmax8() {return fPmax8;}
-  Int_t GetQmax16() {return fQmax16;}
-  Int_t GetPmax16() {return fPmax16;}
-  Int_t GetFlow() {return fFlow;}
-  Int_t GetMltpl() {return fMltpl;}
-  Double_t GetBinWidth() {return fBinWidth;}
-  Double_t GetR0() {return fR0;}
-  Double_t GetPtMax() {return fPtMax;}
-  Double_t GetPtMin() {return fPtMin;}
-  Bool_t GetOtherEquations() {return fOtherEquations;}
+  Int_t GetQmax() const {return fQmax;}
+  Int_t GetPmax() const {return fPmax;}
+  Int_t GetQmax4() const {return fQmax4;}
+  Int_t GetPmax4() const {return fPmax4;}
+  Int_t GetQmax6() const {return fQmax6;}
+  Int_t GetPmax6() const {return fPmax6;}
+  Int_t GetQmax8() const {return fQmax8;}
+  Int_t GetPmax8() const {return fPmax8;}
+  Int_t GetQmax16() const {return fQmax16;}
+  Int_t GetPmax16() const {return fPmax16;}
+  Int_t GetFlow() const {return fFlow;}
+  Int_t GetMltpl() const {return fMltpl;}
+  Double_t GetBinWidth() const {return fBinWidth;}
+  Double_t GetR0() const {return fR0;}
+  Double_t GetPtMax() const {return fPtMax;}
+  Double_t GetPtMin() const {return fPtMin;}
+  Bool_t GetOtherEquations() const {return fOtherEquations;}
   
   void SetQmax( Int_t i ) {fQmax = i;}
   void SetPmax( Int_t i ) {fPmax = i;}
@@ -80,29 +80,29 @@ private:
   AliFlowCumuConstants& operator= (const AliFlowCumuConstants& c);
   AliFlowCumuConstants(const AliFlowCumuConstants& a);
 
-  Int_t fQmax; //
-  Int_t fPmax; //
-  Int_t fQmax4; //
-  Int_t fPmax4; //
-  Int_t fQmax6; //
-  Int_t fPmax6; //
-  Int_t fQmax8; //
-  Int_t fPmax8; //
-  Int_t fQmax16; //
-  Int_t fPmax16; //
-  Int_t fFlow; //
-  Int_t fMltpl; //
+  Int_t fQmax; // Qmax
+  Int_t fPmax; // Pmax
+  Int_t fQmax4; // Qmax4
+  Int_t fPmax4; // Pmax4
+  Int_t fQmax6; // Qmax6
+  Int_t fPmax6; // Pmax6
+  Int_t fQmax8; // Qmax8
+  Int_t fPmax8; // Pmax8
+  Int_t fQmax16; // Qmax16
+  Int_t fPmax16; // Pmax16
+  Int_t fFlow; // flow estimate
+  Int_t fMltpl; // multiple
 
   // Histograms limits
-  Double_t  fBinWidth; //
-  Double_t  fR0; //
-  Double_t  fPtMax; //
-  Double_t  fPtMin; //
+  Double_t  fBinWidth; // bin width
+  Double_t  fR0; // R0
+  Double_t  fPtMax; // Pt max
+  Double_t  fPtMin; // Pt min
   
   // Other numerical equations for cumulants 
-  Bool_t  fOtherEquations; //
+  Bool_t  fOtherEquations; // othe equations
 
-  static AliFlowCumuConstants* fgPMasterConfig;
+  static AliFlowCumuConstants* fgPMasterConfig; // master config
 
   ClassDef(AliFlowCumuConstants,1)  // macro for rootcint
 };