modernized code to C++11 and newer.
This allows to analyze the code by external code analyzers. Since a lot is adopted, the version is changed to 1.4.3
This commit is contained in:
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -31,10 +31,11 @@
|
||||
#define _PFOURIER_H_
|
||||
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include "fftw3.h"
|
||||
|
||||
#include <TH1F.h>
|
||||
|
||||
#include "Minuit2/FCNBase.h"
|
||||
|
||||
#include "PMusr.h"
|
||||
@ -51,7 +52,7 @@ class PFTPhaseCorrection : public ROOT::Minuit2::FCNBase
|
||||
{
|
||||
public:
|
||||
PFTPhaseCorrection(const Int_t minBin=-1, const Int_t maxBin=-1);
|
||||
PFTPhaseCorrection(vector<Double_t> &reFT, vector<Double_t> &imFT, const Int_t minBin=-1, const Int_t maxBin=-1);
|
||||
PFTPhaseCorrection(std::vector<Double_t> &reFT, std::vector<Double_t> &imFT, const Int_t minBin=-1, const Int_t maxBin=-1);
|
||||
virtual ~PFTPhaseCorrection() {}
|
||||
|
||||
virtual Bool_t IsValid() { return fValid; }
|
||||
@ -67,14 +68,14 @@ class PFTPhaseCorrection : public ROOT::Minuit2::FCNBase
|
||||
private:
|
||||
Bool_t fValid;
|
||||
|
||||
vector<Double_t> fReal; /// original real Fourier data set
|
||||
vector<Double_t> fImag; /// original imag Fourier data set
|
||||
mutable vector<Double_t> fRealPh; /// phased real Fourier data set
|
||||
mutable vector<Double_t> fImagPh; /// phased imag Fourier data set
|
||||
mutable vector<Double_t> fRealPhD; /// 1st derivative of fRealPh
|
||||
std::vector<Double_t> fReal; /// original real Fourier data set
|
||||
std::vector<Double_t> fImag; /// original imag Fourier data set
|
||||
mutable std::vector<Double_t> fRealPh; /// phased real Fourier data set
|
||||
mutable std::vector<Double_t> fImagPh; /// phased imag Fourier data set
|
||||
mutable std::vector<Double_t> fRealPhD; /// 1st derivative of fRealPh
|
||||
|
||||
Double_t fMinBin; /// minimum bin from Fourier range to be used for the phase correction estimate
|
||||
Double_t fMaxBin; /// maximum bin from Fourier range to be used for the phase correction estimate
|
||||
Int_t fMinBin; /// minimum bin from Fourier range to be used for the phase correction estimate
|
||||
Int_t fMaxBin; /// maximum bin from Fourier range to be used for the phase correction estimate
|
||||
mutable Double_t fPh_c0; /// constant part of the phase dispersion used for the phase correction
|
||||
mutable Double_t fPh_c1; /// linear part of the phase dispersion used for the phase correction
|
||||
Double_t fGamma; /// gamma parameter to balance between entropy and penalty
|
||||
@ -87,7 +88,7 @@ class PFTPhaseCorrection : public ROOT::Minuit2::FCNBase
|
||||
virtual Double_t Entropy() const;
|
||||
|
||||
virtual Double_t Up() const { return 1.0; }
|
||||
virtual Double_t operator()(const vector<Double_t>&) const;
|
||||
virtual Double_t operator()(const std::vector<Double_t>&) const;
|
||||
};
|
||||
|
||||
/**
|
||||
@ -108,12 +109,12 @@ class PFourier
|
||||
virtual Double_t GetResolution() { return fResolution; }
|
||||
virtual Double_t GetMaxFreq();
|
||||
virtual TH1F* GetRealFourier(const Double_t scale = 1.0);
|
||||
//as virtual TH1F* GetPhaseOptRealFourier(vector<Double_t> &phase, const Double_t scale = 1.0, const Double_t min = -1.0, const Double_t max = -1.0);
|
||||
//as virtual TH1F* GetPhaseOptRealFourier(std::vector<Double_t> &phase, const Double_t scale = 1.0, const Double_t min = -1.0, const Double_t max = -1.0);
|
||||
virtual TH1F* GetImaginaryFourier(const Double_t scale = 1.0);
|
||||
virtual TH1F* GetPowerFourier(const Double_t scale = 1.0);
|
||||
virtual TH1F* GetPhaseFourier(const Double_t scale = 1.0);
|
||||
|
||||
static TH1F* GetPhaseOptRealFourier(const TH1F *re, const TH1F *im, vector<Double_t> &phase,
|
||||
static TH1F* GetPhaseOptRealFourier(const TH1F *re, const TH1F *im, std::vector<Double_t> &phase,
|
||||
const Double_t scale = 1.0, const Double_t min = -1.0, const Double_t max = -1.0);
|
||||
|
||||
virtual Bool_t IsValid() { return fValid; }
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -30,6 +30,8 @@
|
||||
#ifndef _PFOURIERCANVAS_H_
|
||||
#define _PFOURIERCANVAS_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include <TObject.h>
|
||||
#include <TQObject.h>
|
||||
#include <TTimer.h>
|
||||
@ -71,14 +73,14 @@ typedef struct {
|
||||
TH1F *dataFourierPwr; ///< power spectrum of the Fourier transform of the data histogram
|
||||
TH1F *dataFourierPhase; ///< phase spectrum of the Fourier transform of the data histogram
|
||||
TH1F *dataFourierPhaseOptReal; ///< phase otpimized real Fourier transform of the data histogram
|
||||
vector<Double_t> optPhase; ///< optimal phase which maximizes the real Fourier
|
||||
std::vector<Double_t> optPhase; ///< optimal phase which maximizes the real Fourier
|
||||
} PFourierCanvasDataSet;
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable: list of histogram data sets.
|
||||
*/
|
||||
typedef vector<PFourierCanvasDataSet> PFourierCanvasDataList;
|
||||
typedef std::vector<PFourierCanvasDataSet> PFourierCanvasDataList;
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
@ -88,11 +90,11 @@ class PFourierCanvas : public TObject, public TQObject
|
||||
{
|
||||
public:
|
||||
PFourierCanvas();
|
||||
PFourierCanvas(vector<PFourier*> &fourier, PIntVector dataSetTag, const Char_t* title,
|
||||
PFourierCanvas(std::vector<PFourier*> &fourier, PIntVector dataSetTag, const Char_t* title,
|
||||
const Bool_t showAverage, const Bool_t showAveragePerDataSet,
|
||||
const Int_t fourierPlotOpt, Double_t fourierXrange[2], Double_t phase,
|
||||
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh, const Bool_t batch);
|
||||
PFourierCanvas(vector<PFourier*> &fourier, PIntVector dataSetTag, const Char_t* title,
|
||||
PFourierCanvas(std::vector<PFourier*> &fourier, PIntVector dataSetTag, const Char_t* title,
|
||||
const Bool_t showAverage, const Bool_t showAveragePerDataSet,
|
||||
const Int_t fourierPlotOpt, Double_t fourierXrange[2], Double_t phase,
|
||||
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
|
||||
@ -127,7 +129,7 @@ class PFourierCanvas : public TObject, public TQObject
|
||||
|
||||
TString fTitle;
|
||||
TString fXaxisTitle;
|
||||
vector<PFourier*> fFourier; ///< keeps all the Fourier data, ownership is with the caller
|
||||
std::vector<PFourier*> fFourier; ///< keeps all the Fourier data, ownership is with the caller
|
||||
PFourierCanvasDataList fFourierHistos; ///< keeps all the Fourier histos
|
||||
PFourierCanvasDataList fFourierAverage; ///< keeps the average of the Fourier histos
|
||||
Double_t fCurrentFourierPhase; ///< keeps the current Fourier phase (real/imag)
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -81,7 +81,7 @@ typedef struct func_tree_node {
|
||||
Int_t fIvalue; ///< for parameter numbers and maps
|
||||
Bool_t fSign; ///< for sign, true means '-', false '+'
|
||||
Double_t fDvalue; ///< for numbers
|
||||
vector<func_tree_node> children; ///< holding sub-tree
|
||||
std::vector<func_tree_node> children; ///< holding sub-tree
|
||||
} PFuncTreeNode;
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
@ -96,8 +96,8 @@ class PFunction {
|
||||
virtual Bool_t IsValid() { return fValid; }
|
||||
virtual Int_t GetFuncNo() { return fFuncNo; }
|
||||
virtual Bool_t CheckMapAndParamRange(UInt_t mapSize, UInt_t paramSize);
|
||||
virtual Double_t Eval(vector<Double_t> param);
|
||||
virtual void SetMap(vector<Int_t> map) { fMap = map; }
|
||||
virtual Double_t Eval(std::vector<Double_t> param);
|
||||
virtual void SetMap(std::vector<Int_t> map) { fMap = map; }
|
||||
|
||||
virtual TString* GetFuncString() { return &fFuncString; }
|
||||
|
||||
@ -114,8 +114,8 @@ class PFunction {
|
||||
|
||||
private:
|
||||
tree_parse_info<> fInfo; ///< AST parse tree holding a single parsed msr-function in an ascii representation
|
||||
vector<Double_t> fParam; ///< parameter vector (from the msr-file Fit Parameter block)
|
||||
vector<Int_t> fMap; ///< map vector
|
||||
std::vector<Double_t> fParam; ///< parameter vector (from the msr-file Fit Parameter block)
|
||||
std::vector<Int_t> fMap; ///< map vector
|
||||
PFuncTreeNode fFunc;
|
||||
|
||||
Bool_t fValid; ///< flag showing if the function is valid
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -30,9 +30,6 @@
|
||||
#ifndef _PFUNCTIONGRAMMAR_H_
|
||||
#define _PFUNCTIONGRAMMAR_H_
|
||||
|
||||
#include <iostream>
|
||||
using namespace std;
|
||||
|
||||
//#define BOOST_SPIRIT_DEBUG
|
||||
|
||||
#include <boost/version.hpp>
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -32,7 +32,6 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include <TString.h>
|
||||
|
||||
@ -52,7 +51,7 @@ class PFunctionHandler
|
||||
virtual Bool_t IsValid() { return fValid; }
|
||||
virtual Bool_t DoParse();
|
||||
virtual Bool_t CheckMapAndParamRange(UInt_t mapSize, UInt_t paramSize);
|
||||
virtual double Eval(Int_t funNo, vector<Int_t> map, vector<double> param);
|
||||
virtual double Eval(Int_t funNo, std::vector<Int_t> map, std::vector<double> param);
|
||||
virtual Int_t GetFuncNo(UInt_t idx);
|
||||
virtual Int_t GetFuncIndex(Int_t funcNo);
|
||||
virtual UInt_t GetNoOfFuncs() { return fFuncs.size(); }
|
||||
@ -62,8 +61,8 @@ class PFunctionHandler
|
||||
Bool_t fValid; ///< true = function handler has valid functions
|
||||
|
||||
PMsrLines fLines; ///< stores the msr-file FUNCTIONS block as clear text.
|
||||
vector<PFunction> fFuncs; ///< vector of all evaluatable functions
|
||||
vector<TString> fFuncComment; ///< vector of prepended function comments
|
||||
std::vector<PFunction> fFuncs; ///< vector of all evaluatable functions
|
||||
std::vector<TString> fFuncComment; ///< vector of prepended function comments
|
||||
};
|
||||
|
||||
#endif // _PFUNCTIONHANDLER_H_
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2009-2016 by Bastian M. Wojek / Andreas Suter *
|
||||
* Copyright (C) 2009-2019 by Bastian M. Wojek / Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -37,7 +37,6 @@
|
||||
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
using namespace std;
|
||||
|
||||
#include "PRunDataHandler.h"
|
||||
#include "PStartupHandler.h"
|
||||
@ -52,42 +51,42 @@ using namespace std;
|
||||
class PMsr2Data
|
||||
{
|
||||
public:
|
||||
PMsr2Data(const string&); // File extension
|
||||
PMsr2Data(const std::string&); // File extension
|
||||
~PMsr2Data();
|
||||
|
||||
int SetRunNumbers(unsigned int); // single run given
|
||||
int SetRunNumbers(unsigned int, unsigned int); // run list specified through first and last run number
|
||||
int SetRunNumbers(const string&); // run list file given
|
||||
int SetRunNumbers(const vector<unsigned int>&); // explicit run list specified using [ ]
|
||||
int SetRunNumbers(const std::string&); // run list file given
|
||||
int SetRunNumbers(const std::vector<unsigned int>&); // explicit run list specified using [ ]
|
||||
unsigned int GetPresentRun() const;
|
||||
|
||||
int DetermineRunNumberDigits(unsigned int, bool) const;
|
||||
int CheckRunNumbersInRange() const;
|
||||
|
||||
int ParseXmlStartupFile();
|
||||
int ReadMsrFile(const string&) const;
|
||||
int ReadMsrFile(const std::string&) const;
|
||||
int ReadRunDataFile();
|
||||
|
||||
bool PrepareNewInputFile(unsigned int, bool) const; // template
|
||||
bool PrepareGlobalInputFile(unsigned int, const string&, unsigned int) const; // generate msr-input file for a global fit
|
||||
bool PrepareGlobalInputFile(unsigned int, const std::string&, unsigned int) const; // generate msr-input file for a global fit
|
||||
|
||||
int WriteOutput(const string&, const vector<unsigned int>&, bool, unsigned int, bool global = false, unsigned int counter = 0) const;
|
||||
int WriteOutput(const std::string&, const std::vector<unsigned int>&, bool, unsigned int, bool global = false, unsigned int counter = 0) const;
|
||||
|
||||
private:
|
||||
bool PrepareNewSortedInputFile(unsigned int) const; // template
|
||||
PMsrHandler* GetSingleRunMsrFile() const;
|
||||
|
||||
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;
|
||||
void WriteValue(std::fstream &outFile, const double &value, const unsigned int &width) const;
|
||||
void WriteValue(std::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;
|
||||
bool InParameterList(const unsigned int ¶mValue, const std::vector<unsigned int>&) const;
|
||||
|
||||
string fFileExtension;
|
||||
vector<unsigned int> fRunVector;
|
||||
mutable vector<unsigned int>::const_iterator fRunVectorIter;
|
||||
std::string fFileExtension;
|
||||
std::vector<unsigned int> fRunVector;
|
||||
mutable std::vector<unsigned int>::const_iterator fRunVectorIter;
|
||||
bool fRunListFile;
|
||||
vector<string> fIndVar;
|
||||
ifstream *fRunListFileStream;
|
||||
std::vector<std::string> fIndVar;
|
||||
std::ifstream *fRunListFileStream;
|
||||
TSAXParser *fSaxParser;
|
||||
PStartupHandler *fStartupHandler;
|
||||
mutable PRunDataHandler *fDataHandler;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -50,8 +50,8 @@ class PMsrHandler
|
||||
|
||||
virtual Int_t ReadMsrFile();
|
||||
virtual Int_t WriteMsrLogFile(const Bool_t messages = true);
|
||||
virtual Int_t WriteMsrFile(const Char_t *filename, map<UInt_t, TString> *commentsPAR = 0, map<UInt_t, TString> *commentsTHE = 0, \
|
||||
map<UInt_t, TString> *commentsFUN = 0, map<UInt_t, TString> *commentsRUN = 0);
|
||||
virtual Int_t WriteMsrFile(const Char_t *filename, std::map<UInt_t, TString> *commentsPAR = 0, std::map<UInt_t, TString> *commentsTHE = 0, \
|
||||
std::map<UInt_t, TString> *commentsFUN = 0, std::map<UInt_t, TString> *commentsRUN = 0);
|
||||
|
||||
virtual TString* GetMsrTitle() { return &fTitle; }
|
||||
virtual PMsrParamList* GetMsrParamList() { return &fParam; }
|
||||
@ -91,7 +91,7 @@ class PMsrHandler
|
||||
virtual UInt_t GetFuncIndex(Int_t funNo) { return fFuncHandler->GetFuncIndex(funNo); }
|
||||
virtual Bool_t CheckMapAndParamRange(UInt_t mapSize, UInt_t paramSize)
|
||||
{ return fFuncHandler->CheckMapAndParamRange(mapSize, paramSize); }
|
||||
virtual Double_t EvalFunc(UInt_t i, vector<Int_t> map, vector<Double_t> param)
|
||||
virtual Double_t EvalFunc(UInt_t i, std::vector<Int_t> map, std::vector<Double_t> param)
|
||||
{ return fFuncHandler->Eval(i,map,param); }
|
||||
|
||||
virtual UInt_t GetNoOfFitParameters(UInt_t idx);
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2018 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -32,7 +32,6 @@
|
||||
|
||||
#include <vector>
|
||||
#include <map>
|
||||
using namespace std;
|
||||
|
||||
#include <TString.h>
|
||||
|
||||
@ -152,55 +151,55 @@ using namespace std;
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of a bool vector.
|
||||
*/
|
||||
typedef vector<Bool_t> PBoolVector;
|
||||
typedef std::vector<Bool_t> PBoolVector;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of an unsigned int vector
|
||||
*/
|
||||
typedef vector<UInt_t> PUIntVector;
|
||||
typedef std::vector<UInt_t> PUIntVector;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of an int vector
|
||||
*/
|
||||
typedef vector<Int_t> PIntVector;
|
||||
typedef std::vector<Int_t> PIntVector;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of an int pair
|
||||
*/
|
||||
typedef pair<Int_t, Int_t> PIntPair;
|
||||
typedef std::pair<Int_t, Int_t> PIntPair;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of an int pair vector
|
||||
*/
|
||||
typedef vector<PIntPair> PIntPairVector;
|
||||
typedef std::vector<PIntPair> PIntPairVector;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of a double vector
|
||||
*/
|
||||
typedef vector<Double_t> PDoubleVector;
|
||||
typedef std::vector<Double_t> PDoubleVector;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of a double pair
|
||||
*/
|
||||
typedef pair<Double_t, Double_t> PDoublePair;
|
||||
typedef std::pair<Double_t, Double_t> PDoublePair;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of a double pair vector
|
||||
*/
|
||||
typedef vector<PDoublePair> PDoublePairVector;
|
||||
typedef std::vector<PDoublePair> PDoublePairVector;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>typedef to make to code more readable. Definition of a string vector
|
||||
*/
|
||||
typedef vector<TString> PStringVector;
|
||||
typedef std::vector<TString> PStringVector;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
@ -269,8 +268,8 @@ class PNonMusrRawRunData {
|
||||
virtual Bool_t FromAscii() { return fFromAscii; }
|
||||
virtual const PStringVector* GetLabels() { return &fLabels; }
|
||||
virtual const PStringVector* GetDataTags() { return &fDataTags; }
|
||||
virtual const vector<PDoubleVector>* GetData() { return &fData; }
|
||||
virtual const vector<PDoubleVector>* GetErrData() { return &fErrData; }
|
||||
virtual const std::vector<PDoubleVector>* GetData() { return &fData; }
|
||||
virtual const std::vector<PDoubleVector>* GetErrData() { return &fErrData; }
|
||||
|
||||
virtual void SetFromAscii(const Bool_t bval) { fFromAscii = bval; }
|
||||
virtual void AppendLabel(const TString str) { fLabels.push_back(str); }
|
||||
@ -285,8 +284,8 @@ class PNonMusrRawRunData {
|
||||
Bool_t fFromAscii; ///< if true: data file was an ascii input file, otherwise it is a db input file
|
||||
PStringVector fLabels; ///< vector of all labels (used for x-, y-axis title in view)
|
||||
PStringVector fDataTags; ///< vector of all data tags
|
||||
vector<PDoubleVector> fData; ///< vector of all data
|
||||
vector<PDoubleVector> fErrData; ///< vector of all data errors
|
||||
std::vector<PDoubleVector> fData; ///< vector of all data
|
||||
std::vector<PDoubleVector> fErrData; ///< vector of all data errors
|
||||
};
|
||||
|
||||
//-------------------------------------------------------------
|
||||
@ -356,7 +355,7 @@ class PRawRunDataVector {
|
||||
virtual void Set(PRawRunDataSet dataSet, Int_t idx=-1);
|
||||
|
||||
private:
|
||||
vector<PRawRunDataSet> fDataVec;
|
||||
std::vector<PRawRunDataSet> fDataVec;
|
||||
};
|
||||
|
||||
//-------------------------------------------------------------
|
||||
@ -499,7 +498,7 @@ class PRawRunData {
|
||||
/**
|
||||
* <p>typedef to make to code more readable. A vector of a raw musr run.
|
||||
*/
|
||||
typedef vector<PRawRunData> PRawRunDataList;
|
||||
typedef std::vector<PRawRunData> PRawRunDataList;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
@ -514,7 +513,7 @@ typedef struct {
|
||||
/**
|
||||
* <p>typedef to make to code more readable: list of msr-file lines.
|
||||
*/
|
||||
typedef vector<PMsrLineStructure> PMsrLines;
|
||||
typedef std::vector<PMsrLineStructure> PMsrLines;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
@ -539,7 +538,7 @@ typedef struct {
|
||||
/**
|
||||
* <p>typedef to make to code more readable: vector of fit parameters.
|
||||
*/
|
||||
typedef vector<PMsrParamStructure> PMsrParamList;
|
||||
typedef std::vector<PMsrParamStructure> PMsrParamList;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
@ -590,7 +589,7 @@ class PMsrGlobalBlock {
|
||||
Int_t fFitType; ///< fit type: 0=single histo fit, 1=single histo RRF fit, 2=asymmetry fit, 4=mu^- single histo fit, 8=non muSR fit
|
||||
Int_t fDataRange[4]; ///< data bin range (fit type 0, 1, 2, 4)
|
||||
PDoubleVector fT0; ///< t0 bins (fit type 0, 1, 2, 4). if fit type 0 -> f0, f1, f2, ...; if fit type 2, 4 -> f0, b0, f1, b1, ...
|
||||
vector<PDoubleVector> fAddT0; ///< addt0 bins (fit type 0, 1, 2, 4). if fit type 0 -> f0, f1, f2, ...; if fit type 2, 4 -> f0, b0, f1, b1, ...
|
||||
std::vector<PDoubleVector> fAddT0; ///< addt0 bins (fit type 0, 1, 2, 4). if fit type 0 -> f0, f1, f2, ...; if fit type 2, 4 -> f0, b0, f1, b1, ...
|
||||
Bool_t fFitRangeInBins; ///< flag telling if fit range is given in time or in bins
|
||||
Double_t fFitRange[2]; ///< fit range in (us)
|
||||
Int_t fFitRangeOffset[2]; ///< if fit range is given in bins it can have the form fit fgb+n0 lgb-n1. This variable holds the n0 and n1.
|
||||
@ -646,7 +645,7 @@ class PMsrRunBlock {
|
||||
virtual Int_t GetYDataIndex() { return fXYDataIndex[1]; }
|
||||
virtual TString* GetXDataLabel() { return &fXYDataLabel[0]; }
|
||||
virtual TString* GetYDataLabel() { return &fXYDataLabel[1]; }
|
||||
virtual map<TString, Int_t> *GetParGlobal() { return &fParGlobal; }
|
||||
virtual std::map<TString, Int_t> *GetParGlobal() { return &fParGlobal; }
|
||||
virtual PIntVector *GetMapGlobal() { return &fMapGlobal; }
|
||||
|
||||
virtual void SetRunName(TString &str, Int_t idx=-1);
|
||||
@ -700,7 +699,7 @@ class PMsrRunBlock {
|
||||
Int_t fBkgRange[4]; ///< background bin range (fit type 0, 2, 4)
|
||||
Int_t fDataRange[4]; ///< data bin range (fit type 0, 2, 4)
|
||||
PDoubleVector fT0; ///< t0 bins (fit type 0, 2, 4). if fit type 0 -> f0, f1, f2, ...; if fit type 2, 4 -> f0, b0, f1, b1, ...
|
||||
vector<PDoubleVector> fAddT0; ///< t0 bins for addrun's
|
||||
std::vector<PDoubleVector> fAddT0; ///< t0 bins for addrun's
|
||||
Bool_t fFitRangeInBins; ///< flag telling if fit range is given in time or in bins
|
||||
Double_t fFitRange[2]; ///< fit range in (us)
|
||||
Int_t fFitRangeOffset[2]; ///< if fit range is given in bins it can have the form fit fgb+n0 lgb-n1. This variable holds the n0 and n1.
|
||||
@ -716,7 +715,7 @@ class PMsrRunBlock {
|
||||
// -1 -> tag not present in the RUN block
|
||||
// The information about global parameters in the map line is stored in an std::vector which should have the same length as the map-vector
|
||||
// The values in this std::vector can be the same as for the std::map of the other parameters.
|
||||
map<TString, Int_t> fParGlobal; ///< here is stored if the parameters used in the RUN block are global or not
|
||||
std::map<TString, Int_t> fParGlobal; ///< here is stored if the parameters used in the RUN block are global or not
|
||||
PIntVector fMapGlobal; ///< here is stored if the maps used in the RUN block are global or not
|
||||
};
|
||||
|
||||
@ -724,7 +723,7 @@ class PMsrRunBlock {
|
||||
/**
|
||||
* <p>typedef to make to code more readable: list of runs with its parameters.
|
||||
*/
|
||||
typedef vector<PMsrRunBlock> PMsrRunList;
|
||||
typedef std::vector<PMsrRunBlock> PMsrRunList;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
@ -772,7 +771,7 @@ typedef struct {
|
||||
/**
|
||||
* <p>typedef to make to code more readable: list of plots.
|
||||
*/
|
||||
typedef vector<PMsrPlotStructure> PMsrPlotList;
|
||||
typedef std::vector<PMsrPlotStructure> PMsrPlotList;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
@ -833,18 +832,18 @@ typedef struct {
|
||||
class PStringNumberList {
|
||||
public:
|
||||
PStringNumberList(char *str) { fString = str; }
|
||||
PStringNumberList(string str) { fString = str; }
|
||||
PStringNumberList(std::string str) { fString = str; }
|
||||
virtual ~PStringNumberList() { fList.clear(); }
|
||||
|
||||
virtual bool Parse(string &errorMsg, bool ignoreFirstToken=false);
|
||||
virtual bool Parse(std::string &errorMsg, bool ignoreFirstToken=false);
|
||||
virtual PUIntVector GetList() { return fList; }
|
||||
|
||||
private:
|
||||
string fString;
|
||||
std::string fString;
|
||||
bool fIsValid;
|
||||
PUIntVector fList;
|
||||
|
||||
virtual bool IsNumber(string &str) { return (str.find_first_not_of("0123456789") == string::npos); }
|
||||
virtual bool IsNumber(std::string &str) { return (str.find_first_not_of("0123456789") == std::string::npos); }
|
||||
virtual void StripSpaces();
|
||||
};
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -145,7 +145,7 @@ typedef struct {
|
||||
/**
|
||||
* <p>typedef to make to code more readable: list of histogram data sets.
|
||||
*/
|
||||
typedef vector<PMusrCanvasDataSet> PMusrCanvasDataList;
|
||||
typedef std::vector<PMusrCanvasDataSet> PMusrCanvasDataList;
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
/**
|
||||
@ -176,7 +176,7 @@ typedef struct {
|
||||
/**
|
||||
* <p>typedef to make to code more readable: list of error graph data sets.
|
||||
*/
|
||||
typedef vector<PMusrCanvasNonMusrDataSet> PMusrCanvasNonMusrDataList;
|
||||
typedef std::vector<PMusrCanvasNonMusrDataSet> PMusrCanvasNonMusrDataList;
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
/**
|
||||
@ -193,7 +193,7 @@ typedef struct {
|
||||
* <p> typedef to make to code more readable: vector of the above data structure.
|
||||
* Used if there are multiple histogramms to be dumped.
|
||||
*/
|
||||
typedef vector<PMusrCanvasAsciiDump> PMusrCanvasAsciiDumpVector;
|
||||
typedef std::vector<PMusrCanvasAsciiDump> PMusrCanvasAsciiDumpVector;
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -84,7 +84,7 @@ class PMusrT0Data {
|
||||
virtual Int_t GetT0BinData() { return fT0Data; }
|
||||
|
||||
virtual void SetSingleHisto(const Bool_t flag) { fSingleHisto = flag; }
|
||||
virtual void SetRawRunData(const vector<PRawRunData*> rawRunData) { fRawRunData = rawRunData; }
|
||||
virtual void SetRawRunData(const std::vector<PRawRunData*> rawRunData) { fRawRunData = rawRunData; }
|
||||
virtual void SetRunNo(const UInt_t runNo) { fRunNo = runNo; }
|
||||
virtual void SetAddRunIdx(const UInt_t addRunIdx) { fAddRunIdx = addRunIdx; }
|
||||
virtual void SetHistoNoIdx(const UInt_t histoNoIdx) { fHistoNoIdx = histoNoIdx; }
|
||||
@ -97,7 +97,7 @@ class PMusrT0Data {
|
||||
|
||||
private:
|
||||
Bool_t fSingleHisto; ///< true if single histo fit, false for asymmetry fit
|
||||
vector<PRawRunData*> fRawRunData; ///< holds the raw data of the needed runs, idx=0 the run, idx>0 the addruns
|
||||
std::vector<PRawRunData*> fRawRunData; ///< holds the raw data of the needed runs, idx=0 the run, idx>0 the addruns
|
||||
Int_t fRunNo; ///< msr-file run number
|
||||
Int_t fAddRunIdx; ///< msr-file addrun index
|
||||
Int_t fHistoNoIdx; ///< msr-file histo number index
|
||||
@ -105,7 +105,7 @@ class PMusrT0Data {
|
||||
Int_t fDetectorTag; ///< detector tag. forward=0,backward=1
|
||||
Int_t fCmdTag; ///< command tag. 0=get t0, 1=get data-/bkg-range, 2=get t0, and data-/bkg-range
|
||||
PIntVector fT0; ///< holding the t0's of the run
|
||||
vector<PIntVector> fAddT0; ///< holding the t0's of the addruns
|
||||
std::vector<PIntVector> fAddT0; ///< holding the t0's of the addruns
|
||||
Int_t fT0Data; ///< holding the t0 found in the current data set
|
||||
};
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -32,7 +32,6 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include <TH1F.h>
|
||||
#include <TMath.h>
|
||||
@ -75,12 +74,12 @@ class PPrepFourier {
|
||||
TString GetInfo(const UInt_t idx);
|
||||
Int_t GetDataSetTag(const UInt_t idx);
|
||||
UInt_t GetNoOfData() { return fRawData.size(); }
|
||||
vector<TH1F*> GetData();
|
||||
std::vector<TH1F*> GetData();
|
||||
TH1F *GetData(const UInt_t idx);
|
||||
|
||||
private:
|
||||
vector<musrFT_data> fRawData;
|
||||
vector<PDoubleVector>fData;
|
||||
std::vector<musrFT_data> fRawData;
|
||||
std::vector<PDoubleVector>fData;
|
||||
Int_t fBkgRange[2];
|
||||
PDoubleVector fBkg;
|
||||
Int_t fPacking;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -31,7 +31,6 @@
|
||||
#define _PRUNBASE_H_
|
||||
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include <TString.h>
|
||||
|
||||
@ -51,8 +50,8 @@ class PRunBase
|
||||
PRunBase(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag);
|
||||
virtual ~PRunBase();
|
||||
|
||||
virtual Double_t CalcChiSquare(const vector<Double_t>& par) = 0; ///< pure virtual, i.e. needs to be implemented by the deriving class!!
|
||||
virtual Double_t CalcMaxLikelihood(const vector<Double_t>& par) = 0; ///< pure virtual, i.e. needs to be implemented by the deriving class!!
|
||||
virtual Double_t CalcChiSquare(const std::vector<Double_t>& par) = 0; ///< pure virtual, i.e. needs to be implemented by the deriving class!!
|
||||
virtual Double_t CalcMaxLikelihood(const std::vector<Double_t>& par) = 0; ///< pure virtual, i.e. needs to be implemented by the deriving class!!
|
||||
virtual void SetFitRange(PDoublePairVector fitRange);
|
||||
|
||||
virtual void CalcTheory() = 0; ///< pure virtual, i.e. needs to be implemented by the deriving class!!
|
||||
@ -75,7 +74,7 @@ class PRunBase
|
||||
PRunData fData; ///< data to be fitted, viewed, i.e. binned data
|
||||
Double_t fTimeResolution; ///< time resolution in (us)
|
||||
PDoubleVector fT0s; ///< all t0 bins of a run! The derived classes will handle it.
|
||||
vector<PDoubleVector> fAddT0s; ///< all t0 bins of all addrun's of a run! The derived classes will handle it.
|
||||
std::vector<PDoubleVector> fAddT0s; ///< all t0 bins of all addrun's of a run! The derived classes will handle it.
|
||||
|
||||
Double_t fFitStartTime; ///< fit start time
|
||||
Double_t fFitEndTime; ///< fit end time
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -30,9 +30,6 @@
|
||||
#ifndef _PRUNDATAHANDLER_H_
|
||||
#define _PRUNDATAHANDLER_H_
|
||||
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include <TString.h>
|
||||
|
||||
#include "PMusr.h"
|
||||
@ -108,7 +105,7 @@ class PRunDataHandler
|
||||
virtual TString GenerateOutputFileName(const TString fileName, const TString extension, Bool_t &ok);
|
||||
virtual TString GetFileName(const TString extension, Bool_t &ok);
|
||||
virtual TString FileNameFromTemplate(TString &fileNameTemplate, Int_t run, TString &year, Bool_t &ok);
|
||||
virtual bool DateToISO8601(string inDate, string &iso8601Date);
|
||||
virtual bool DateToISO8601(std::string inDate, std::string &iso8601Date);
|
||||
virtual void SplitTimeDate(TString timeDate, TString &time, TString &date, Bool_t &ok);
|
||||
virtual TString GetMonth(Int_t month);
|
||||
virtual TString GetYear(Int_t month);
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -31,7 +31,6 @@
|
||||
#define _PRUNLISTCOLLECTION_H_
|
||||
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include "PMusr.h"
|
||||
#include "PMsrHandler.h"
|
||||
@ -107,12 +106,12 @@ class PRunListCollection
|
||||
PMsrHandler *fMsrInfo; ///< pointer to the msr-file handler
|
||||
PRunDataHandler *fData; ///< pointer to the run-data handler
|
||||
|
||||
vector<PRunSingleHisto*> fRunSingleHistoList; ///< stores all processed single histogram data
|
||||
vector<PRunSingleHistoRRF*> fRunSingleHistoRRFList; ///< stores all processed single histogram RRF data
|
||||
vector<PRunAsymmetry*> fRunAsymmetryList; ///< stores all processed asymmetry data
|
||||
vector<PRunAsymmetryRRF*> fRunAsymmetryRRFList; ///< stores all processed asymmetry RRF data
|
||||
vector<PRunMuMinus*> fRunMuMinusList; ///< stores all processed mu-minus data
|
||||
vector<PRunNonMusr*> fRunNonMusrList; ///< stores all processed non-muSR data
|
||||
std::vector<PRunSingleHisto*> fRunSingleHistoList; ///< stores all processed single histogram data
|
||||
std::vector<PRunSingleHistoRRF*> fRunSingleHistoRRFList; ///< stores all processed single histogram RRF data
|
||||
std::vector<PRunAsymmetry*> fRunAsymmetryList; ///< stores all processed asymmetry data
|
||||
std::vector<PRunAsymmetryRRF*> fRunAsymmetryRRFList; ///< stores all processed asymmetry RRF data
|
||||
std::vector<PRunMuMinus*> fRunMuMinusList; ///< stores all processed mu-minus data
|
||||
std::vector<PRunNonMusr*> fRunNonMusrList; ///< stores all processed non-muSR data
|
||||
};
|
||||
|
||||
#endif // _PRUNLISTCOLLECTION_H_
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -290,7 +290,7 @@ class PTheory
|
||||
// variables
|
||||
Bool_t fValid; ///< flag to tell if the theory is valid
|
||||
UInt_t fType; ///< function tag
|
||||
vector<UInt_t> fParamNo; ///< holds the parameter numbers for the theory (including maps and functions, see constructor desciption)
|
||||
std::vector<UInt_t> fParamNo; ///< holds the parameter numbers for the theory (including maps and functions, see constructor desciption)
|
||||
UInt_t fNoOfParam; ///< number of parameters for the given function
|
||||
PTheory *fAdd, *fMul; ///< pointers to the add-sub-function or the multiply-sub-function
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
@ -31,7 +31,6 @@
|
||||
#define _PUSERFCNBASE_H_
|
||||
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include "TObject.h"
|
||||
#include "TSAXParser.h"
|
||||
@ -47,7 +46,7 @@ class PUserFcnBase : public TObject
|
||||
virtual ~PUserFcnBase();
|
||||
|
||||
virtual Bool_t NeedGlobalPart() const = 0; ///< if a user function needs a global part this function should return true, otherwise false
|
||||
virtual void SetGlobalPart(vector<void *> &globalPart, UInt_t idx) = 0; ///< if a user function is using a global part, this function is used to invoke and retrieve the proper global object
|
||||
virtual void SetGlobalPart(std::vector<void *> &globalPart, UInt_t idx) = 0; ///< if a user function is using a global part, this function is used to invoke and retrieve the proper global object
|
||||
virtual Bool_t GlobalPartIsValid() const = 0; ///< if a user function is using a global part, this function returns if the global object part is valid
|
||||
|
||||
virtual Double_t operator()(Double_t t, const std::vector<Double_t> ¶m) const = 0;
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2007-2016 by Andreas Suter *
|
||||
* Copyright (C) 2007-2019 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
|
||||
Reference in New Issue
Block a user