Remove redundant and optimize code for saving data to ascii in batch mode.

This commit is contained in:
salman 2015-01-27 11:17:06 +01:00
parent 55fb9df820
commit acb5a1af09
3 changed files with 633 additions and 1544 deletions

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -340,7 +340,9 @@ int main(int argc, char *argv[])
} }
if (asciiOutput) { if (asciiOutput) {
musrCanvas->SaveDataAsciiAndQuit(); // save data in batch mode
musrCanvas->SaveDataAscii();
musrCanvas->Done(0);
} }
// keep musrCanvas objects // keep musrCanvas objects