merge dks to master

src/include/PRunAsymmetryRRF.h

@@ -52,6 +52,9 @@ class PRunAsymmetryRRF : public PRunBase
 
     virtual void SetFitRangeBin(const TString fitRange);
 
+    virtual Int_t GetStartTimeBin() { return fStartTimeBin; }
+    virtual Int_t GetEndTimeBin() { return fEndTimeBin; }
+
   protected:
     virtual void CalcNoOfFitBins();
     virtual Bool_t PrepareData();
@@ -70,6 +73,9 @@ class PRunAsymmetryRRF : public PRunBase
 
     Int_t fGoodBins[4];   ///< keep first/last good bins. 0=fgb, 1=lgb (forward); 2=fgb, 3=lgb (backward)
 
+    Int_t fStartTimeBin;    ///< bin at which the fit starts
+    Int_t fEndTimeBin;      ///< bin at which the fit ends
+
     Bool_t SubtractFixBkg();
     Bool_t SubtractEstimatedBkg();
 

src/include/PRunSingleHistoRRF.h

@@ -51,6 +51,9 @@ class PRunSingleHistoRRF : public PRunBase
 
     virtual void SetFitRangeBin(const TString fitRange);
 
+    virtual Int_t GetStartTimeBin() { return fStartTimeBin; }
+    virtual Int_t GetEndTimeBin() { return fEndTimeBin; }
+
   protected:
     virtual void CalcNoOfFitBins();
     virtual Bool_t PrepareData();
@@ -62,10 +65,14 @@ class PRunSingleHistoRRF : public PRunBase
 
     UInt_t fNoOfFitBins;    ///< number of bins to be fitted
     Double_t fBackground;   ///< needed if background range is given (units: 1/bin)
+    Double_t fBkgErr;       ///< estimate error on the estimated background
     Int_t fRRFPacking;      ///< RRF packing for this particular run. Given in the GLOBAL-block.
 
     Int_t fGoodBins[2];     ///< keep first/last good bins. 0=fgb, 1=lgb
 
+    Int_t fStartTimeBin;    ///< bin at which the fit starts
+    Int_t fEndTimeBin;      ///< bin at which the fit ends
+
     PDoubleVector fForward; ///< forward histo data
     PDoubleVector fM;       ///< vector holding M(t) = [N(t)-N_bkg] exp(+t/tau). Needed to estimate N0.
     PDoubleVector fMerr;    ///< vector holding the error of M(t): M_err = exp(+t/tau) sqrt(N(t)).