Removing left-over "return".

[u/mrichter/AliRoot.git] / PWGHF / correlationHF / AliHFDmesonCorrAverage.h

diff --git a/PWGHF/correlationHF/AliHFDmesonCorrAverage.h b/PWGHF/correlationHF/AliHFDmesonCorrAverage.h
index 571476b46c3fd4442aae2202a3daaf2158b3dd1a..fb817847a935d08b5aba39af5f92385cdf264f97 100644 (file)
--- a/PWGHF/correlationHF/AliHFDmesonCorrAverage.h
+++ b/PWGHF/correlationHF/AliHFDmesonCorrAverage.h
@@ -1,4 +1,3 @@
-// WORK IN PROG
 #ifndef ALIHFDMESONCORRAVERAGE_H
 #define ALIHFDMESONCORRAVERAGE_H
 /* Copyright(c) 1998-2009, ALICE Experiment at CERN, All rights reserved. *
@@ -35,7 +34,7 @@ class AliHFDmesonCorrAverage : public TNamed {
   void SetDzeroHisto(TH1D *h){fhDzero=(TH1D*)h->Clone("hInputDzero");}
   void SetDplusHisto(TH1D *h){fhDplus=(TH1D*)h->Clone("hInputDplus");}
   void SetDstarHisto(TH1D *h){fhDstar=(TH1D*)h->Clone("hInputDstar");}
-  
+  void SetArithmeticAverage(Bool_t averType){fArithmeticAverage=averType;}  
   void SetMethod(Int_t method){fmethod=method;}
   void SetSystem(Int_t sys,Int_t year){fsys=sys;fyear=year;}
   void SetMomentumRanges(Double_t minptD,Double_t maxptD,Double_t minptAsso,Double_t maxptAsso){fptminD=minptD;fptmaxD=maxptD;fptminAsso=minptAsso;fptmaxAsso=maxptAsso;}
@@ -43,11 +42,20 @@ class AliHFDmesonCorrAverage : public TNamed {
   TH1D *GetAverageHisto(){return fhDaverage;}
   void InitAverageHisto(TH1D *h);
   TH1D *ReflectHisto(TH1D *h);
-  
+  TH1D *GetWeightsUsedDzero(){
+    return fhUsedWeightsDzero;
+  }
+  TH1D *GetWeightsUsedDstar(){
+    return fhUsedWeightsDstar;
+  }
+  TH1D *GetWeightsUsedDplus(){
+    return fhUsedWeightsDplus;
+  }
   void SetDzeroSystUnc(AliHFDhadronCorrSystUnc *sys){fSystDzero=(AliHFDhadronCorrSystUnc*)sys->Clone("fSystDzero");}
   void SetDplusSystUnc(AliHFDhadronCorrSystUnc *sys){fSystDplus=(AliHFDhadronCorrSystUnc*)sys->Clone("fSystDplus");}
   void SetDstarSystUnc(AliHFDhadronCorrSystUnc *sys){fSystDstar=(AliHFDhadronCorrSystUnc*)sys->Clone("fSystDstar");}
-  
+
+  void SetSystAreAlreadySet(Bool_t syst){fSystAlreadySet=syst;}
   AliHFDhadronCorrSystUnc* GetAverageSystUncertainty(){return fSystDaverage;}
  private:
   void SetWeights();
@@ -83,8 +91,14 @@ class AliHFDmesonCorrAverage : public TNamed {
   Double_t *fweightsDplusSystBkg;                       // Dplus weights used
   Int_t   fnbinsphi;                        // nbins phi
   Int_t          fsys;                                 //system (0=pp, 1=pPb)
-  Int_t          fyear;                                // year  (20010 for pp@7 TeV, 2013 for pPb@5.02 TeV)
-  ClassDef(AliHFDmesonCorrAverage,1); //class for averaging D meson -hadron correlations
+  Int_t          fyear;                                // year  (2010 for pp@7 TeV, 2013 for pPb@5.02 TeV)
+  Bool_t fSystAlreadySet;                       // Set it to kTRUE when systematic uncertainties from external files are set
+  Bool_t fArithmeticAverage;                   // flag to perform arithmetic average
+  TH1D *fhUsedWeightsDzero;                    // histogram with final weights used for Dzero
+  TH1D *fhUsedWeightsDstar;                   // histogram with final weights used for Dstar
+  TH1D *fhUsedWeightsDplus;                   // histogram with final weights used for Dplus
+
+  ClassDef(AliHFDmesonCorrAverage,3); //class for averaging D meson -hadron correlations
 };