LMU/musrfit
5
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

moved hardware info to the place where it is needed.

Browse Source
This commit is contained in:
suter_a
2018-06-04 14:30:09 +02:00
parent 58148581ba
commit 122db33efc
5 changed files with 111 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/include/PFitter.h
View File

@@ -68,7 +68,7 @@
class PFitter
{
public:
PFitter(PMsrHandler *runInfo, PRunListCollection *runListCollection, Bool_t chisq_only = false, TString hardwareInfo = TString("??"));
PFitter(PMsrHandler *runInfo, PRunListCollection *runListCollection, Bool_t chisq_only = false);
virtual ~PFitter();
Bool_t IsValid() { return fIsValid; }
@@ -85,7 +85,6 @@ class PFitter
Bool_t fChisqOnly; ///< flag. true: calculate chi^2 only (no fitting).
Bool_t fUseChi2; ///< flag. true: chi^2 fit. false: log-max-likelihood
UInt_t fPrintLevel; ///< tag, showing the level of messages whished. 0=minimum, 1=standard, 2=maximum
TString fHardwareInfo; ///< string containing the CPU/GPU information.
UInt_t fStrategy; ///< fitting strategy (see minuit2 manual).
@@ -134,7 +133,9 @@ class PFitter
Bool_t ExecuteSave(Bool_t first);
Bool_t ExecuteSimplex();
Double_t MilliTime();
Double_t MilliTime();
string GetCPUInfo();
};
#endif // _PFITTER_H_

2
src/include/PFitterFcnDKS.h
View File

@@ -58,6 +58,8 @@ class PFitterFcnDKS : public ROOT::Minuit2::FCNBase
virtual UInt_t GetTotalNoOfFittedBins() { return fRunListCollection->GetTotalNoOfBinsFitted(); }
virtual UInt_t GetNoOfFittedBins(const UInt_t idx) { return fRunListCollection->GetNoOfBinsFitted(idx); }
virtual void CalcExpectedChiSquare(const std::vector<Double_t> &par, Double_t &totalExpectedChisq, std::vector<Double_t> &expectedChisqPerRun);
virtual int GetDeviceName(string &devName);
private:
Bool_t fValid; ///< flag needed to ensure a valid state