implmented some startup features

This commit is contained in:
nemu
2008-04-03 13:10:49 +00:00
parent 5fc7e14f3f
commit 0652495a3f
13 changed files with 101 additions and 24 deletions
+1 -5
View File
@@ -32,11 +32,6 @@
#ifndef _PMSRHANDLER_H_
#define _PMSRHANDLER_H_
/*
#include <vector>
using namespace std;
*/
#include <TString.h>
#include <TComplex.h>
@@ -72,6 +67,7 @@ class PMsrHandler
virtual bool SetMsrParamValue(unsigned int i, double value);
virtual bool SetMsrParamStep(unsigned int i, double value);
virtual bool SetMsrParamPosErrorPresent(unsigned int i, bool value);
virtual bool SetMsrParamPosError(unsigned int i, double value);
virtual void SetMsrStatisticMin(double min) { fStatistic.fMin = min; }
+6
View File
@@ -110,6 +110,12 @@ typedef vector<double> PDoubleVector;
*/
typedef vector<TComplex> PComplexVector;
//-------------------------------------------------------------
/**
* <p> typedef to make to code more readable.
*/
typedef vector<TString> PStringVector;
//------------------------------------------------------------------------------------------
/**
* <p>Predominantly used in PRunBase.
+5 -1
View File
@@ -52,7 +52,8 @@ class PMusrCanvas : public TObject, public TQObject
{
public:
PMusrCanvas();
PMusrCanvas(const char* title, Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh);
PMusrCanvas(const char* title, Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
const PIntVector markerList, const PIntVector colorList);
virtual ~PMusrCanvas();
virtual Bool_t IsValid() { return fValid; }
@@ -82,6 +83,9 @@ class PMusrCanvas : public TObject, public TQObject
PMsrLines fTheoryList;
PMsrLines fFunctionList;
PIntVector fMarkerList;
PIntVector fColorList;
ClassDef(PMusrCanvas, 1)
};
+3 -2
View File
@@ -43,14 +43,15 @@ using namespace std;
class PRunDataHandler
{
public:
PRunDataHandler(PMsrHandler *msrInfo);
PRunDataHandler(PMsrHandler *msrInfo, const PStringVector dataPath);
virtual ~PRunDataHandler();
virtual bool IsAllDataAvailable() { return fAllDataAvailable; }
virtual PRawRunData* GetRunData(TString runName);
private:
PMsrHandler *fMsrInfo;
PMsrHandler *fMsrInfo;
PStringVector fDataPath;
bool fAllDataAvailable; ///< flag indicating if all data sets could be read
TString fRunName; ///< current run name
+5 -1
View File
@@ -56,13 +56,17 @@ class PStartupHandler : public TObject, public TQObject
virtual void OnFatalError(const char*); // SLOT
virtual void OnCdataBlock(const char*, Int_t); // SLOT
virtual const PStringVector GetDataPathList() const { return fDataPathList; }
virtual const PIntVector GetMarkerList() const { return fMarkerList; }
virtual const PIntVector GetColorList() const { return fColorList; }
private:
enum EKeyWords {eEmpty, eComment, eDataPath,
eRootSettings, eMarkerList, eMarker,
eColorList, eColor};
EKeyWords fKey;
vector<TString> fDataPathList;
PStringVector fDataPathList;
PIntVector fMarkerList;
PIntVector fColorList;