merged branch 'master' into 'dks'
This commit is contained in:
@@ -71,7 +71,7 @@ class PMsr2Data
|
||||
bool PrepareNewInputFile(unsigned int, bool) const; // template
|
||||
bool PrepareGlobalInputFile(unsigned int, const string&, unsigned int) const; // generate msr-input file for a global fit
|
||||
|
||||
int WriteOutput(const string&, bool, unsigned int, bool global = false, unsigned int counter = 0) const;
|
||||
int WriteOutput(const string&, const vector<unsigned int>&, bool, unsigned int, bool global = false, unsigned int counter = 0) const;
|
||||
|
||||
private:
|
||||
bool PrepareNewSortedInputFile(unsigned int) const; // template
|
||||
@@ -80,6 +80,7 @@ class PMsr2Data
|
||||
void WriteValue(fstream &outFile, const double &value, const unsigned int &width) const;
|
||||
void WriteValue(fstream &outFile, const double &value, const double &errValue, const unsigned int &width, const bool &db) const;
|
||||
int GetFirstSignificantDigit(const double &value) const;
|
||||
bool InParameterList(const unsigned int ¶mValue, const vector<unsigned int>&) const;
|
||||
|
||||
string fFileExtension;
|
||||
vector<unsigned int> fRunVector;
|
||||
|
||||
@@ -58,7 +58,7 @@ class PRunSingleHistoRRF : public PRunBase
|
||||
virtual Bool_t PrepareViewData(PRawRunData* runData, const UInt_t histoNo);
|
||||
|
||||
private:
|
||||
static const Double_t fN0EstimateEndTime = 1.0; ///< end time in (us) over which N0 is estimated. Should eventually be estimated automatically ...
|
||||
Double_t fN0EstimateEndTime; ///< end time in (us) over which N0 is estimated.
|
||||
|
||||
UInt_t fNoOfFitBins; ///< number of bins to be fitted
|
||||
Double_t fBackground; ///< needed if background range is given (units: 1/bin)
|
||||
|
||||
Reference in New Issue
Block a user