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

Merge remote-tracking branch 'origin/depthProf' into root6

Browse Source
This commit is contained in:
suter_a
2023-02-17 07:39:17 +01:00
parent 7f3cc5a18f 6c8c8d6706
commit 9e88ddb989
172 changed files with 18799 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/include/PMusr.h
View File

@@ -294,6 +294,7 @@ class PNonMusrRawRunData {
virtual const std::vector<PDoubleVector>* GetErrData() { return &fErrData; }
virtual void SetFromAscii(const Bool_t bval) { fFromAscii = bval; }
virtual void SetSize(const UInt_t size);
virtual void AppendLabel(const TString str) { fLabels.push_back(str); }
virtual void SetLabel(const UInt_t idx, const TString str);
virtual void AppendDataTag(const TString str) { fDataTags.push_back(str); }
@@ -303,7 +304,7 @@ class PNonMusrRawRunData {
virtual void AppendSubErrData(const UInt_t idx, const Double_t dval);
private:
Bool_t fFromAscii; ///< if true: data file was an ascii input file, otherwise it is a db input file
Bool_t fFromAscii; ///< if true: data file was an ascii input file, otherwise it is a db/dat input file
PStringVector fLabels; ///< vector of all labels (used for x-, y-axis title in view)
PStringVector fDataTags; ///< vector of all data tags
std::vector<PDoubleVector> fData; ///< vector of all data

1
src/include/PRgeHandler.h
View File

@@ -109,6 +109,7 @@ class PRgeHandler : public TObject
virtual ~PRgeHandler() {}
virtual bool IsValid() { return fValid; }
virtual UInt_t GetNoOfRgeDataSets() { return (UInt_t)fData.size(); }
virtual PRgeDataList GetRgeData() { return fData; }
virtual Double_t GetZmax(const Double_t energy);
virtual Double_t GetZmax(const Int_t idx);

1
src/include/PRunDataHandler.h
View File

@@ -89,6 +89,7 @@ class PRunDataHandler
virtual Bool_t ReadMduAsciiFile();
virtual Bool_t ReadAsciiFile();
virtual Bool_t ReadDBFile();
virtual Bool_t ReadDatFile();
virtual Bool_t WriteMusrRootFile(TString fln="");
virtual Bool_t WriteRootFile(TString fln="");

3
src/include/PRunNonMusr.h
View File

@@ -40,7 +40,7 @@ class PRunNonMusr : public PRunBase
{
public:
PRunNonMusr();
PRunNonMusr(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag);
PRunNonMusr(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag, Bool_t theoAsData);
virtual ~PRunNonMusr();
virtual Double_t CalcChiSquare(const std::vector<Double_t>& par);
@@ -65,6 +65,7 @@ class PRunNonMusr : public PRunBase
UInt_t fNoOfFitBins; ///< number of bins to be be fitted
Int_t fPacking; ///< packing for this particular run. Either given in the RUN- or GLOBAL-block.
Bool_t fTheoAsData; ///< true=only calculate the theory points at the data points, false=calculate more points for the theory as compared to data are calculated which lead to 'nicer' Fouriers
Int_t fStartTimeBin; ///< bin at which the fit starts
Int_t fEndTimeBin; ///< bin at which the fit ends