Merge branch 'master' of ssh://gitorious.psi.ch/nemu/musrfit

This commit is contained in:
2015-02-02 15:54:01 +01:00
6 changed files with 1037 additions and 951 deletions

View File

@@ -229,6 +229,7 @@ class PMusrCanvas : public TObject, public TQObject
virtual void LastCanvasClosed(); // SLOT
virtual void SaveGraphicsAndQuit(Char_t *fileName, Char_t *graphicsFormat);
virtual void SaveDataAscii();
private:
Int_t fTimeout; ///< timeout after which the Done signal should be emited. If timeout <= 0, no timeout is taking place
@@ -329,8 +330,6 @@ class PMusrCanvas : public TObject, public TQObject
virtual void IncrementFourierPhase();
virtual void DecrementFourierPhase();
virtual void SaveDataAscii();
virtual Bool_t IsScaleN0AndBkg();
virtual UInt_t GetNeededAccuracy(PMsrParamStructure param);