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

first working FFT including DKS.

Browse Source
This commit is contained in:
suter_a
2015-04-13 17:21:27 +02:00
parent a393cb9ec5
commit a2601348cf
10 changed files with 87 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/PMusr.h
View File

@@ -798,6 +798,7 @@ typedef struct {
Bool_t writeExpectedChisq; ///< if set to true, expected chisq per block will be written
Bool_t estimateN0; ///< if set to true, for single histogram fits N0 will be estimated
Double_t alphaEstimateN0; ///< relates the Bkg to N0, i.e. Bkg = alpha*N0
Bool_t useDKS; ///< if set to true, use DKS if present and "sensible"
} PStartupOptions;
#endif // _PMUSR_H_

5
src/include/PMusrCanvas.h
View File

@@ -203,12 +203,12 @@ class PMusrCanvas : public TObject, public TQObject
PMusrCanvas();
PMusrCanvas(const Int_t number, const Char_t* title,
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh, const Bool_t batch,
const Bool_t fourier=false);
const Bool_t fourier=false, const Bool_t useDKS=false);
PMusrCanvas(const Int_t number, const Char_t* title,
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
PMsrFourierStructure fourierDefault,
const PIntVector markerList, const PIntVector colorList, const Bool_t batch,
const Bool_t fourier=false);
const Bool_t fourier=false, const Bool_t useDKS=false);
virtual ~PMusrCanvas();
virtual Bool_t IsValid() { return fValid; }
@@ -233,6 +233,7 @@ class PMusrCanvas : public TObject, public TQObject
private:
Bool_t fStartWithFourier; ///< flag if true, the Fourier transform will be presented bypassing the time domain representation
Bool_t fUseDKS; ///< flag if true, use DKS if it is enabled
Int_t fTimeout; ///< timeout after which the Done signal should be emited. If timeout <= 0, no timeout is taking place
Bool_t fScaleN0AndBkg; ///< true=N0 and background is scaled to (1/ns), otherwise (1/bin) for the single histogram case
Bool_t fBatchMode; ///< musrview in ROOT batch mode

2
src/include/PStartupHandler.h
View File

@@ -82,7 +82,7 @@ class PStartupHandler : public TObject, public TQObject
virtual void SetStartupOptions(const PStartupOptions opt) { fStartupOptions = opt; }
private:
enum EKeyWords {eEmpty, eComment, eDataPath, eOptions, eWritePerRunBlockChisq, eEstimateN0, eAlphaEstimateN0,
enum EKeyWords {eEmpty, eComment, eDataPath, eOptions, eWritePerRunBlockChisq, eEstimateN0, eAlphaEstimateN0, eUseDKS,
eFourierSettings, eUnits, eFourierPower, eApodization, ePlot, ePhase, ePhaseIncrement,
eRootSettings, eMarkerList, eMarker,
eColorList, eColor};